147248 2015-07-23 19:00:56 -0700 Call fixChangeLogPatch when generating patches from webkit-patch 2015-08-14 11:45:34 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified REOPENED P2 Normal --- 148032 1 basile_clement basile_clement ap commit-queue dbates ddkilzer fpizlo glenn ossy oldest_to_newest 1111878 0 basile_clement 2015-07-23 19:00:56 -0700 Call fixChangeLogPatch when generating patches from webkit-patch 1111879 1 257419 basile_clement 2015-07-23 19:12:47 -0700 Created attachment 257419 Patch 1112010 2 257419 ggaren 2015-07-24 10:45:41 -0700 Comment on attachment 257419 Patch r=me 1112049 3 257464 basile_clement 2015-07-24 12:00:50 -0700 Created attachment 257464 Patch for landing 1112050 4 257464 basile_clement 2015-07-24 12:01:27 -0700 Comment on attachment 257464 Patch for landing "Reviewed by NOBODY (OOPS!)" 1112051 5 basile_clement 2015-07-24 12:02:31 -0700 (In reply to comment #4) > Comment on attachment 257464 [details] > Patch for landing > > "Reviewed by NOBODY (OOPS!)" We should really make "webkit-patch land -g commitish" correctly handle the reviewer it got from bugzilla... 1112052 6 257465 basile_clement 2015-07-24 12:03:00 -0700 Created attachment 257465 Patch for landing 1112070 7 257465 commit-queue 2015-07-24 13:24:20 -0700 Comment on attachment 257465 Patch for landing Clearing flags on attachment: 257465 Committed r187357: <http://trac.webkit.org/changeset/187357> 1112071 8 commit-queue 2015-07-24 13:24:25 -0700 All reviewed patches have been landed. Closing bug. 1117678 9 dbates 2015-08-14 11:27:45 -0700 (In reply to comment #8) > All reviewed patches have been landed. Closing bug. This patch is incorrect because it makes the assumption that VCSUtils::fixChangeLogPatch() can be called with the stringified content of an arbitrary patch. But VCSUtils::fixChangeLogPatch() assumes its argument represents a ChangeLog patch as stated in an inline comment in the first line of the function body [1] and implied in the description above VCSUtils::fixChangeLogPatch() [2]. As a result of this bad assumption, webkit-patch may generate an incorrect patch file in the worst case and only adjust the diff of the first ChangeLog file in a patch in the best case. Additional remarks: An incorrect patch is only generated when its contents has the form of two consecutive ChangeLog entries that have one or more identical lines. Looking at incorrect patches generated with this patch. In the best case, this patch will have webkit-patch generate ChangeLog diffs that can only be applied with a fuzz factor > 3. One example of this can be seen in the WebCore ChangeLog diff in attachment #258971, which can only be applied with fuzz factor >= 5 (the fuzz factor of the generated patch is proportional to the number of lines in the diff chunk range for the source ChangeLog file whose ChangeLog entry was adjusted). In the worst case, it can generate an incorrect patch that is not faithful to the actual changes/intentions of the author and may be difficult to identify as incorrect by eye, especially if such a patch applies without warnings/errors and a person or reviewer is not looking out for such incorrect patches. [1] <http://trac.webkit.org/browser/trunk/Tools/Scripts/VCSUtils.pm?rev=185710#L1599> [2] <http://trac.webkit.org/browser/trunk/Tools/Scripts/VCSUtils.pm?rev=185710#L1570> 1117682 10 dbates 2015-08-14 11:32:45 -0700 (In reply to comment #7) > Comment on attachment 257465 [details] > Patch for landing > > Clearing flags on attachment: 257465 > > Committed r187357: <http://trac.webkit.org/changeset/187357> I propose that we roll out this change. 1117689 11 commit-queue 2015-08-14 11:45:34 -0700 Re-opened since this is blocked by bug 148032 257419 2015-07-23 19:12:47 -0700 2015-07-24 12:00:46 -0700 Patch bug-147248-20150723191131.patch text/plain 4662 basile_clement U3VidmVyc2lvbiBSZXZpc2lvbjogMTg3MjgxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYzUyOTg0MWJjYmVlZTlhYmMwYjIyMGEwMWYxYTgwZTRl ODc5MmRkYy4uYzUzYmU3YWZmZjRiZWNhZmVlMzY1NjcxNzliNDljMTQ4ZmZlNzk2ZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMz IEBACisyMDE1LTA3LTIzICBCYXNpbGUgQ2xlbWVudCAgPGJhc2lsZV9jbGVtZW50QGFwcGxlLmNv bT4KKworICAgICAgICBDYWxsIGZpeENoYW5nZUxvZ1BhdGNoIHdoZW4gZ2VuZXJhdGluZyBwYXRj aGVzIGZyb20gd2Via2l0LXBhdGNoCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNDcyNDgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBXaGVuIHR3byBjb25zZWN1dGl2ZSBwYXRjaGVzIGFyZSBmcm9tIHRoZSBz YW1lIGF1dGhvciwgZGlmZiB0b29scworICAgICAgICBjcmVhdGUgd3JvbmctbG9va2luZyBkaWZm cyBmb3IgQ2hhbmdlTG9nIGZpbGVzIHdoZXJlIHRoZSBhcHBhcmVudCBhZGRlZAorICAgICAgICBh dXRob3IgaXMgYWN0dWFsbHkgdGhlIHByZXZpb3VzIHBhdGNoJ3MgYXV0aG9yIGxpbmUsIG1ha2lu ZyBpdCBhd2t3YXJkCisgICAgICAgIHRvIHJlYWQgLSBhbmQgdGhpbmdzIG9ubHkgZ2V0IHdvcnNl IHdoZW4gY29tbWl0dGluZyBhIHBhdGNoIGFuZCBhCisgICAgICAgIGZvbGxvd3VwIGZpeCBmb3Ig dGhlIHNhbWUgYnVnIHNob3J0bHkgYWZ0ZXIuIAorICAgICAgICAKKyAgICAgICAgV2UgaGF2ZSBh IHBlcmwgZnVuY3Rpb24gaW4gVkNTVXRpbHMucG0sIGZpeENoYW5nZUxvZ1BhdGNoLCB0byBjb3Jy ZWN0cworICAgICAgICB0aGlzLCB3aGljaCB3ZSB1c2UgaW4gcGVybCBzY3JpcHRzIChzdm4tY3Jl YXRlLXBhdGNoIGV0IGFsKS4gQnV0IGl0IGlzCisgICAgICAgIG5vdCB1c2VkIGJ5IHdlYmtpdC1w YXRjaCwgd2hpY2ggaXMgYSBweXRob24gc2NyaXB0LCBhbmQgdGh1cyBjcmVhdGVzCisgICAgICAg ICJiYWQiIGRpZmZzLgorCisgICAgICAgIEluIHRoZSBsb25nIHRlcm0sIHdlIHNob3VsZCBwcm9i YWJseSBwb3J0IGZpeENoYW5nZUxvZ1BhdGNoIHRvIHB5dGhvbiAtCisgICAgICAgIGJ1dCBpbiB0 aGUgc2hvcnQgdGVybSwgbGV0J3MgbWFrZSB3ZWJraXQtcGF0Y2ggY2FsbCBwZXJsIHRvIHJ1bgor ICAgICAgICBmaXhDaGFuZ2VMb2dQYXRjaC4gV2UgYXJlIGFscmVhZHkgbWFraW5nIHZhcmlvdXMg ZXh0ZXJuYWwgY2FsbHMgdGhlcmUKKyAgICAgICAgYW55d2F5LgorCisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL2dpdC5weToKKyAgICAgICAgKEdpdC5jcmVh dGVfcGF0Y2gpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3Nj bS9zY20ucHk6CisgICAgICAgIChTQ00uZml4X2NoYW5nZWxvZ19wYXRjaCk6CisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3N2bi5weToKKyAgICAgICAgKFNW Ti5jcmVhdGVfcGF0Y2gpOgorCiAyMDE1LTA3LTIzICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1A YXBwbGUuY29tPgogCiAgICAgICAgIFtXaW5dIEltcGxlbWVudCBwcm9wZXIgSGlnaCBEUEkgc3Vw cG9ydCBmZWF0dXJlcwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24v Y2hlY2tvdXQvc2NtL2dpdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNr b3V0L3NjbS9naXQucHkKaW5kZXggN2FiYjlhYWMwMGJlNmY5MWI5NTk1ZGU3NDk3YTc2MmQxMmVi MDBmMC4uYzhlMWUzY2UwMjgzMmZhZjEwYjVjNzc3OTUzMGY4NDdmMzE5Nzc0MiAxMDA2NDQKLS0t IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL2dpdC5weQorKysg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vZ2l0LnB5CkBAIC0z MjEsNyArMzIxLDkgQEAgY2xhc3MgR2l0KFNDTSwgU1ZOUmVwb3NpdG9yeSk6CiAgICAgICAgIGNv bW1hbmQgKz0gWyItLSJdCiAgICAgICAgIGlmIGNoYW5nZWRfZmlsZXM6CiAgICAgICAgICAgICBj b21tYW5kICs9IGNoYW5nZWRfZmlsZXMKLSAgICAgICAgcmV0dXJuIHNlbGYucHJlcGVuZF9zdm5f cmV2aXNpb24oc2VsZi5ydW4oY29tbWFuZCwgZGVjb2RlX291dHB1dD1GYWxzZSwgY3dkPXNlbGYu Y2hlY2tvdXRfcm9vdCkpCisgICAgICAgIHJldHVybiBzZWxmLmZpeF9jaGFuZ2Vsb2dfcGF0Y2go CisgICAgICAgICAgICAgICAgc2VsZi5wcmVwZW5kX3N2bl9yZXZpc2lvbigKKyAgICAgICAgICAg ICAgICAgICAgc2VsZi5ydW4oY29tbWFuZCwgZGVjb2RlX291dHB1dD1GYWxzZSwgY3dkPXNlbGYu Y2hlY2tvdXRfcm9vdCkpKQogCiAgICAgZGVmIF9ydW5fZ2l0X3N2bl9maW5kX3JldihzZWxmLCBy ZXZpc2lvbl9vcl90cmVlaXNoLCBicmFuY2g9Tm9uZSk6CiAgICAgICAgICMgZ2l0IHN2biBmaW5k LXJldiByZXF1aXJlcyBTVk4gcmV2aXNpb25zIHRvIGJlZ2luIHdpdGggdGhlIGNoYXJhY3RlciAn cicuCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9z Y20vc2NtLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3Nj bS5weQppbmRleCBlYmI2YzA5MTM5OTZjMmUyMjQ3ZTIwZDEwOWU5YjYxMjE1YjQxOGIwLi5iM2Rj ZjcwOWE0ZjZlOWIzOWE1MTI2MWYzMDhjZDFlNmJjNjNmNjM5IDEwMDY0NAotLS0gYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtLnB5CisrKyBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY20ucHkKQEAgLTc3LDYgKzc3LDEy IEBAIGNsYXNzIFNDTToKICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybl9zdGRlcnI9 cmV0dXJuX3N0ZGVyciwKICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRlY29kZV9vdXRwdXQ9 ZGVjb2RlX291dHB1dCkKIAorICAgIGRlZiBmaXhfY2hhbmdlbG9nX3BhdGNoKHNlbGYsIGRpZmYp OgorICAgICAgICByZXR1cm4gc2VsZi5ydW4oCisgICAgICAgICAgICAgICAgWydwZXJsJywgJy1l JywgJ3VzZSBWQ1NVdGlsczsgcHJpbnQoZml4Q2hhbmdlTG9nUGF0Y2goam9pbigiIiwgPFNURElO PikpLT57InBhdGNoIn0pOyddLAorICAgICAgICAgICAgICAgIGN3ZD1zZWxmLl9maWxlc3lzdGVt LmpvaW4oc2VsZi5jaGVja291dF9yb290LCAnVG9vbHMnLCAnU2NyaXB0cycpLAorICAgICAgICAg ICAgICAgIGlucHV0PWRpZmYsIGRlY29kZV9vdXRwdXQ9RmFsc2UpCisKICAgICAjIFNDTSBhbHdh eXMgcmV0dXJucyByZXBvc2l0b3J5IHJlbGF0aXZlIHBhdGgsIGJ1dCBzb21ldGltZXMgd2UgbmVl ZAogICAgICMgYWJzb2x1dGUgcGF0aHMgdG8gcGFzcyB0byBybSwgZXRjLgogICAgIGRlZiBhYnNv bHV0ZV9wYXRoKHNlbGYsIHJlcG9zaXRvcnlfcmVsYXRpdmVfcGF0aCk6CmRpZmYgLS1naXQgYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc3ZuLnB5IGIvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3N2bi5weQppbmRleCBiMmE1Yzk1 MWMxY2IxODViYjg1YzFkYjRmODJhZDUyYmRmODhhMTk3Li42NjRiZTNlY2NjMWZlZmU5OGE1NDNk NGI3OGMwMjAxYzAwZjYzZDg1IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2Nv bW1vbi9jaGVja291dC9zY20vc3ZuLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29t bW9uL2NoZWNrb3V0L3NjbS9zdm4ucHkKQEAgLTI3Myw5ICsyNzMsMTAgQEAgY2xhc3MgU1ZOKFND TSwgU1ZOUmVwb3NpdG9yeSk6CiAgICAgICAgIGVsaWYgY2hhbmdlZF9maWxlcyA9PSBOb25lOgog ICAgICAgICAgICAgY2hhbmdlZF9maWxlcyA9IFtdCiAgICAgICAgIHNjcmlwdF9wYXRoID0gc2Vs Zi5fZmlsZXN5c3RlbS5qb2luKHNlbGYuY2hlY2tvdXRfcm9vdCwgIlRvb2xzIiwgIlNjcmlwdHMi LCAic3ZuLWNyZWF0ZS1wYXRjaCIpCi0gICAgICAgIHJldHVybiBzZWxmLnJ1bihbc2NyaXB0X3Bh dGgsICItLW5vLXN0eWxlIl0gKyBjaGFuZ2VkX2ZpbGVzLAotICAgICAgICAgICAgY3dkPXNlbGYu Y2hlY2tvdXRfcm9vdCwgcmV0dXJuX3N0ZGVycj1GYWxzZSwKLSAgICAgICAgICAgIGRlY29kZV9v dXRwdXQ9RmFsc2UpCisgICAgICAgIHJldHVybiBzZWxmLmZpeF9jaGFuZ2Vsb2dfcGF0Y2goCisg ICAgICAgICAgICAgICAgc2VsZi5ydW4oW3NjcmlwdF9wYXRoLCAiLS1uby1zdHlsZSJdICsgY2hh bmdlZF9maWxlcywKKyAgICAgICAgICAgICAgICAgICAgY3dkPXNlbGYuY2hlY2tvdXRfcm9vdCwg cmV0dXJuX3N0ZGVycj1GYWxzZSwKKyAgICAgICAgICAgICAgICAgICAgZGVjb2RlX291dHB1dD1G YWxzZSkpCiAKICAgICBkZWYgY29tbWl0dGVyX2VtYWlsX2Zvcl9yZXZpc2lvbihzZWxmLCByZXZp c2lvbik6CiAgICAgICAgIHJldHVybiBzZWxmLl9ydW5fc3ZuKFsicHJvcGdldCIsICJzdm46YXV0 aG9yIiwgIi0tcmV2cHJvcCIsICItciIsIHJldmlzaW9uXSkucnN0cmlwKCkK 257464 2015-07-24 12:00:50 -0700 2015-07-24 12:02:55 -0700 Patch for landing bug-147248-20150724115933.patch text/plain 4656 basile_clement U3VidmVyc2lvbiBSZXZpc2lvbjogMTg3MzUzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNGYzYjllMTJmMjNlZmQ2OGQxZmM1ZmRkMmJjZmQ1MDdj YTEwZjNlMy4uYmI1NGM0ZmIyZjUyYmNhOThhMzA2ZmZhYjU1MWI4N2MwNDUxMzFmZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMz IEBACisyMDE1LTA3LTIzICBCYXNpbGUgQ2xlbWVudCAgPGJhc2lsZV9jbGVtZW50QGFwcGxlLmNv bT4KKworICAgICAgICBDYWxsIGZpeENoYW5nZUxvZ1BhdGNoIHdoZW4gZ2VuZXJhdGluZyBwYXRj aGVzIGZyb20gd2Via2l0LXBhdGNoCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNDcyNDgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBXaGVuIHR3byBjb25zZWN1dGl2ZSBwYXRjaGVzIGFyZSBmcm9tIHRoZSBz YW1lIGF1dGhvciwgZGlmZiB0b29scworICAgICAgICBjcmVhdGUgd3JvbmctbG9va2luZyBkaWZm cyBmb3IgQ2hhbmdlTG9nIGZpbGVzIHdoZXJlIHRoZSBhcHBhcmVudCBhZGRlZAorICAgICAgICBh dXRob3IgaXMgYWN0dWFsbHkgdGhlIHByZXZpb3VzIHBhdGNoJ3MgYXV0aG9yIGxpbmUsIG1ha2lu ZyBpdCBhd2t3YXJkCisgICAgICAgIHRvIHJlYWQgLSBhbmQgdGhpbmdzIG9ubHkgZ2V0IHdvcnNl IHdoZW4gY29tbWl0dGluZyBhIHBhdGNoIGFuZCBhCisgICAgICAgIGZvbGxvd3VwIGZpeCBmb3Ig dGhlIHNhbWUgYnVnIHNob3J0bHkgYWZ0ZXIuCisKKyAgICAgICAgV2UgaGF2ZSBhIHBlcmwgZnVu Y3Rpb24gaW4gVkNTVXRpbHMucG0sIGZpeENoYW5nZUxvZ1BhdGNoLCB0byBjb3JyZWN0cworICAg ICAgICB0aGlzLCB3aGljaCB3ZSB1c2UgaW4gcGVybCBzY3JpcHRzIChzdm4tY3JlYXRlLXBhdGNo IGV0IGFsKS4gQnV0IGl0IGlzCisgICAgICAgIG5vdCB1c2VkIGJ5IHdlYmtpdC1wYXRjaCwgd2hp Y2ggaXMgYSBweXRob24gc2NyaXB0LCBhbmQgdGh1cyBjcmVhdGVzCisgICAgICAgICJiYWQiIGRp ZmZzLgorCisgICAgICAgIEluIHRoZSBsb25nIHRlcm0sIHdlIHNob3VsZCBwcm9iYWJseSBwb3J0 IGZpeENoYW5nZUxvZ1BhdGNoIHRvIHB5dGhvbiAtCisgICAgICAgIGJ1dCBpbiB0aGUgc2hvcnQg dGVybSwgbGV0J3MgbWFrZSB3ZWJraXQtcGF0Y2ggY2FsbCBwZXJsIHRvIHJ1bgorICAgICAgICBm aXhDaGFuZ2VMb2dQYXRjaC4gV2UgYXJlIGFscmVhZHkgbWFraW5nIHZhcmlvdXMgZXh0ZXJuYWwg Y2FsbHMgdGhlcmUKKyAgICAgICAgYW55d2F5LgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS9jb21tb24vY2hlY2tvdXQvc2NtL2dpdC5weToKKyAgICAgICAgKEdpdC5jcmVhdGVfcGF0Y2gp OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY20ucHk6 CisgICAgICAgIChTQ00uZml4X2NoYW5nZWxvZ19wYXRjaCk6CisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3N2bi5weToKKyAgICAgICAgKFNWTi5jcmVhdGVf cGF0Y2gpOgorCiAyMDE1LTA3LTI0ICBEZWFuIEpvaG5zb24gIDxkZWFuX2pvaG5zb25AYXBwbGUu Y29tPgogCiAgICAgICAgIGNvbW1pdC1xdWV1ZSBmbGFncyBpbiB3ZWJraXQtcGF0Y2ggYXJlIGNv bmZ1c2luZwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tv dXQvc2NtL2dpdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3Nj bS9naXQucHkKaW5kZXggN2FiYjlhYWMwMGJlNmY5MWI5NTk1ZGU3NDk3YTc2MmQxMmViMDBmMC4u YzhlMWUzY2UwMjgzMmZhZjEwYjVjNzc3OTUzMGY4NDdmMzE5Nzc0MiAxMDA2NDQKLS0tIGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL2dpdC5weQorKysgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vZ2l0LnB5CkBAIC0zMjEsNyAr MzIxLDkgQEAgY2xhc3MgR2l0KFNDTSwgU1ZOUmVwb3NpdG9yeSk6CiAgICAgICAgIGNvbW1hbmQg Kz0gWyItLSJdCiAgICAgICAgIGlmIGNoYW5nZWRfZmlsZXM6CiAgICAgICAgICAgICBjb21tYW5k ICs9IGNoYW5nZWRfZmlsZXMKLSAgICAgICAgcmV0dXJuIHNlbGYucHJlcGVuZF9zdm5fcmV2aXNp b24oc2VsZi5ydW4oY29tbWFuZCwgZGVjb2RlX291dHB1dD1GYWxzZSwgY3dkPXNlbGYuY2hlY2tv dXRfcm9vdCkpCisgICAgICAgIHJldHVybiBzZWxmLmZpeF9jaGFuZ2Vsb2dfcGF0Y2goCisgICAg ICAgICAgICAgICAgc2VsZi5wcmVwZW5kX3N2bl9yZXZpc2lvbigKKyAgICAgICAgICAgICAgICAg ICAgc2VsZi5ydW4oY29tbWFuZCwgZGVjb2RlX291dHB1dD1GYWxzZSwgY3dkPXNlbGYuY2hlY2tv dXRfcm9vdCkpKQogCiAgICAgZGVmIF9ydW5fZ2l0X3N2bl9maW5kX3JldihzZWxmLCByZXZpc2lv bl9vcl90cmVlaXNoLCBicmFuY2g9Tm9uZSk6CiAgICAgICAgICMgZ2l0IHN2biBmaW5kLXJldiBy ZXF1aXJlcyBTVk4gcmV2aXNpb25zIHRvIGJlZ2luIHdpdGggdGhlIGNoYXJhY3RlciAncicuCmRp ZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2Nt LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbS5weQpp bmRleCBlYmI2YzA5MTM5OTZjMmUyMjQ3ZTIwZDEwOWU5YjYxMjE1YjQxOGIwLi5iM2RjZjcwOWE0 ZjZlOWIzOWE1MTI2MWYzMDhjZDFlNmJjNjNmNjM5IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY20ucHkKQEAgLTc3LDYgKzc3LDEyIEBAIGNs YXNzIFNDTToKICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybl9zdGRlcnI9cmV0dXJu X3N0ZGVyciwKICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRlY29kZV9vdXRwdXQ9ZGVjb2Rl X291dHB1dCkKIAorICAgIGRlZiBmaXhfY2hhbmdlbG9nX3BhdGNoKHNlbGYsIGRpZmYpOgorICAg ICAgICByZXR1cm4gc2VsZi5ydW4oCisgICAgICAgICAgICAgICAgWydwZXJsJywgJy1lJywgJ3Vz ZSBWQ1NVdGlsczsgcHJpbnQoZml4Q2hhbmdlTG9nUGF0Y2goam9pbigiIiwgPFNURElOPikpLT57 InBhdGNoIn0pOyddLAorICAgICAgICAgICAgICAgIGN3ZD1zZWxmLl9maWxlc3lzdGVtLmpvaW4o c2VsZi5jaGVja291dF9yb290LCAnVG9vbHMnLCAnU2NyaXB0cycpLAorICAgICAgICAgICAgICAg IGlucHV0PWRpZmYsIGRlY29kZV9vdXRwdXQ9RmFsc2UpCisKICAgICAjIFNDTSBhbHdheXMgcmV0 dXJucyByZXBvc2l0b3J5IHJlbGF0aXZlIHBhdGgsIGJ1dCBzb21ldGltZXMgd2UgbmVlZAogICAg ICMgYWJzb2x1dGUgcGF0aHMgdG8gcGFzcyB0byBybSwgZXRjLgogICAgIGRlZiBhYnNvbHV0ZV9w YXRoKHNlbGYsIHJlcG9zaXRvcnlfcmVsYXRpdmVfcGF0aCk6CmRpZmYgLS1naXQgYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc3ZuLnB5IGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3N2bi5weQppbmRleCBiMmE1Yzk1MWMxY2Ix ODViYjg1YzFkYjRmODJhZDUyYmRmODhhMTk3Li42NjRiZTNlY2NjMWZlZmU5OGE1NDNkNGI3OGMw MjAxYzAwZjYzZDg1IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9j aGVja291dC9zY20vc3ZuLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2No ZWNrb3V0L3NjbS9zdm4ucHkKQEAgLTI3Myw5ICsyNzMsMTAgQEAgY2xhc3MgU1ZOKFNDTSwgU1ZO UmVwb3NpdG9yeSk6CiAgICAgICAgIGVsaWYgY2hhbmdlZF9maWxlcyA9PSBOb25lOgogICAgICAg ICAgICAgY2hhbmdlZF9maWxlcyA9IFtdCiAgICAgICAgIHNjcmlwdF9wYXRoID0gc2VsZi5fZmls ZXN5c3RlbS5qb2luKHNlbGYuY2hlY2tvdXRfcm9vdCwgIlRvb2xzIiwgIlNjcmlwdHMiLCAic3Zu LWNyZWF0ZS1wYXRjaCIpCi0gICAgICAgIHJldHVybiBzZWxmLnJ1bihbc2NyaXB0X3BhdGgsICIt LW5vLXN0eWxlIl0gKyBjaGFuZ2VkX2ZpbGVzLAotICAgICAgICAgICAgY3dkPXNlbGYuY2hlY2tv dXRfcm9vdCwgcmV0dXJuX3N0ZGVycj1GYWxzZSwKLSAgICAgICAgICAgIGRlY29kZV9vdXRwdXQ9 RmFsc2UpCisgICAgICAgIHJldHVybiBzZWxmLmZpeF9jaGFuZ2Vsb2dfcGF0Y2goCisgICAgICAg ICAgICAgICAgc2VsZi5ydW4oW3NjcmlwdF9wYXRoLCAiLS1uby1zdHlsZSJdICsgY2hhbmdlZF9m aWxlcywKKyAgICAgICAgICAgICAgICAgICAgY3dkPXNlbGYuY2hlY2tvdXRfcm9vdCwgcmV0dXJu X3N0ZGVycj1GYWxzZSwKKyAgICAgICAgICAgICAgICAgICAgZGVjb2RlX291dHB1dD1GYWxzZSkp CiAKICAgICBkZWYgY29tbWl0dGVyX2VtYWlsX2Zvcl9yZXZpc2lvbihzZWxmLCByZXZpc2lvbik6 CiAgICAgICAgIHJldHVybiBzZWxmLl9ydW5fc3ZuKFsicHJvcGdldCIsICJzdm46YXV0aG9yIiwg Ii0tcmV2cHJvcCIsICItciIsIHJldmlzaW9uXSkucnN0cmlwKCkK 257465 2015-07-24 12:03:00 -0700 2015-07-24 13:24:20 -0700 Patch for landing bug-147248-20150724120143.patch text/plain 4656 basile_clement U3VidmVyc2lvbiBSZXZpc2lvbjogMTg3MzUzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNGYzYjllMTJmMjNlZmQ2OGQxZmM1ZmRkMmJjZmQ1MDdj YTEwZjNlMy4uZDQ2NTZiNjdkMjIyZWUwYmY1ZGVkNTBjOTFlOWJjOTQ4ZGVkYWY0NyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMz IEBACisyMDE1LTA3LTIzICBCYXNpbGUgQ2xlbWVudCAgPGJhc2lsZV9jbGVtZW50QGFwcGxlLmNv bT4KKworICAgICAgICBDYWxsIGZpeENoYW5nZUxvZ1BhdGNoIHdoZW4gZ2VuZXJhdGluZyBwYXRj aGVzIGZyb20gd2Via2l0LXBhdGNoCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNDcyNDgKKworICAgICAgICBSZXZpZXdlZCBieSBHZW9mZnJleSBHYXJl bi4KKworICAgICAgICBXaGVuIHR3byBjb25zZWN1dGl2ZSBwYXRjaGVzIGFyZSBmcm9tIHRoZSBz YW1lIGF1dGhvciwgZGlmZiB0b29scworICAgICAgICBjcmVhdGUgd3JvbmctbG9va2luZyBkaWZm cyBmb3IgQ2hhbmdlTG9nIGZpbGVzIHdoZXJlIHRoZSBhcHBhcmVudCBhZGRlZAorICAgICAgICBh dXRob3IgaXMgYWN0dWFsbHkgdGhlIHByZXZpb3VzIHBhdGNoJ3MgYXV0aG9yIGxpbmUsIG1ha2lu ZyBpdCBhd2t3YXJkCisgICAgICAgIHRvIHJlYWQgLSBhbmQgdGhpbmdzIG9ubHkgZ2V0IHdvcnNl IHdoZW4gY29tbWl0dGluZyBhIHBhdGNoIGFuZCBhCisgICAgICAgIGZvbGxvd3VwIGZpeCBmb3Ig dGhlIHNhbWUgYnVnIHNob3J0bHkgYWZ0ZXIuCisKKyAgICAgICAgV2UgaGF2ZSBhIHBlcmwgZnVu Y3Rpb24gaW4gVkNTVXRpbHMucG0sIGZpeENoYW5nZUxvZ1BhdGNoLCB0byBjb3JyZWN0cworICAg ICAgICB0aGlzLCB3aGljaCB3ZSB1c2UgaW4gcGVybCBzY3JpcHRzIChzdm4tY3JlYXRlLXBhdGNo IGV0IGFsKS4gQnV0IGl0IGlzCisgICAgICAgIG5vdCB1c2VkIGJ5IHdlYmtpdC1wYXRjaCwgd2hp Y2ggaXMgYSBweXRob24gc2NyaXB0LCBhbmQgdGh1cyBjcmVhdGVzCisgICAgICAgICJiYWQiIGRp ZmZzLgorCisgICAgICAgIEluIHRoZSBsb25nIHRlcm0sIHdlIHNob3VsZCBwcm9iYWJseSBwb3J0 IGZpeENoYW5nZUxvZ1BhdGNoIHRvIHB5dGhvbiAtCisgICAgICAgIGJ1dCBpbiB0aGUgc2hvcnQg dGVybSwgbGV0J3MgbWFrZSB3ZWJraXQtcGF0Y2ggY2FsbCBwZXJsIHRvIHJ1bgorICAgICAgICBm aXhDaGFuZ2VMb2dQYXRjaC4gV2UgYXJlIGFscmVhZHkgbWFraW5nIHZhcmlvdXMgZXh0ZXJuYWwg Y2FsbHMgdGhlcmUKKyAgICAgICAgYW55d2F5LgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS9jb21tb24vY2hlY2tvdXQvc2NtL2dpdC5weToKKyAgICAgICAgKEdpdC5jcmVhdGVfcGF0Y2gp OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY20ucHk6 CisgICAgICAgIChTQ00uZml4X2NoYW5nZWxvZ19wYXRjaCk6CisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3N2bi5weToKKyAgICAgICAgKFNWTi5jcmVhdGVf cGF0Y2gpOgorCiAyMDE1LTA3LTI0ICBEZWFuIEpvaG5zb24gIDxkZWFuX2pvaG5zb25AYXBwbGUu Y29tPgogCiAgICAgICAgIGNvbW1pdC1xdWV1ZSBmbGFncyBpbiB3ZWJraXQtcGF0Y2ggYXJlIGNv bmZ1c2luZwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tv dXQvc2NtL2dpdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3Nj bS9naXQucHkKaW5kZXggN2FiYjlhYWMwMGJlNmY5MWI5NTk1ZGU3NDk3YTc2MmQxMmViMDBmMC4u YzhlMWUzY2UwMjgzMmZhZjEwYjVjNzc3OTUzMGY4NDdmMzE5Nzc0MiAxMDA2NDQKLS0tIGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL2dpdC5weQorKysgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vZ2l0LnB5CkBAIC0zMjEsNyAr MzIxLDkgQEAgY2xhc3MgR2l0KFNDTSwgU1ZOUmVwb3NpdG9yeSk6CiAgICAgICAgIGNvbW1hbmQg Kz0gWyItLSJdCiAgICAgICAgIGlmIGNoYW5nZWRfZmlsZXM6CiAgICAgICAgICAgICBjb21tYW5k ICs9IGNoYW5nZWRfZmlsZXMKLSAgICAgICAgcmV0dXJuIHNlbGYucHJlcGVuZF9zdm5fcmV2aXNp b24oc2VsZi5ydW4oY29tbWFuZCwgZGVjb2RlX291dHB1dD1GYWxzZSwgY3dkPXNlbGYuY2hlY2tv dXRfcm9vdCkpCisgICAgICAgIHJldHVybiBzZWxmLmZpeF9jaGFuZ2Vsb2dfcGF0Y2goCisgICAg ICAgICAgICAgICAgc2VsZi5wcmVwZW5kX3N2bl9yZXZpc2lvbigKKyAgICAgICAgICAgICAgICAg ICAgc2VsZi5ydW4oY29tbWFuZCwgZGVjb2RlX291dHB1dD1GYWxzZSwgY3dkPXNlbGYuY2hlY2tv dXRfcm9vdCkpKQogCiAgICAgZGVmIF9ydW5fZ2l0X3N2bl9maW5kX3JldihzZWxmLCByZXZpc2lv bl9vcl90cmVlaXNoLCBicmFuY2g9Tm9uZSk6CiAgICAgICAgICMgZ2l0IHN2biBmaW5kLXJldiBy ZXF1aXJlcyBTVk4gcmV2aXNpb25zIHRvIGJlZ2luIHdpdGggdGhlIGNoYXJhY3RlciAncicuCmRp ZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2Nt LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbS5weQpp bmRleCBlYmI2YzA5MTM5OTZjMmUyMjQ3ZTIwZDEwOWU5YjYxMjE1YjQxOGIwLi5iM2RjZjcwOWE0 ZjZlOWIzOWE1MTI2MWYzMDhjZDFlNmJjNjNmNjM5IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY20ucHkKQEAgLTc3LDYgKzc3LDEyIEBAIGNs YXNzIFNDTToKICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybl9zdGRlcnI9cmV0dXJu X3N0ZGVyciwKICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRlY29kZV9vdXRwdXQ9ZGVjb2Rl X291dHB1dCkKIAorICAgIGRlZiBmaXhfY2hhbmdlbG9nX3BhdGNoKHNlbGYsIGRpZmYpOgorICAg ICAgICByZXR1cm4gc2VsZi5ydW4oCisgICAgICAgICAgICAgICAgWydwZXJsJywgJy1lJywgJ3Vz ZSBWQ1NVdGlsczsgcHJpbnQoZml4Q2hhbmdlTG9nUGF0Y2goam9pbigiIiwgPFNURElOPikpLT57 InBhdGNoIn0pOyddLAorICAgICAgICAgICAgICAgIGN3ZD1zZWxmLl9maWxlc3lzdGVtLmpvaW4o c2VsZi5jaGVja291dF9yb290LCAnVG9vbHMnLCAnU2NyaXB0cycpLAorICAgICAgICAgICAgICAg IGlucHV0PWRpZmYsIGRlY29kZV9vdXRwdXQ9RmFsc2UpCisKICAgICAjIFNDTSBhbHdheXMgcmV0 dXJucyByZXBvc2l0b3J5IHJlbGF0aXZlIHBhdGgsIGJ1dCBzb21ldGltZXMgd2UgbmVlZAogICAg ICMgYWJzb2x1dGUgcGF0aHMgdG8gcGFzcyB0byBybSwgZXRjLgogICAgIGRlZiBhYnNvbHV0ZV9w YXRoKHNlbGYsIHJlcG9zaXRvcnlfcmVsYXRpdmVfcGF0aCk6CmRpZmYgLS1naXQgYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc3ZuLnB5IGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3N2bi5weQppbmRleCBiMmE1Yzk1MWMxY2Ix ODViYjg1YzFkYjRmODJhZDUyYmRmODhhMTk3Li42NjRiZTNlY2NjMWZlZmU5OGE1NDNkNGI3OGMw MjAxYzAwZjYzZDg1IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9j aGVja291dC9zY20vc3ZuLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2No ZWNrb3V0L3NjbS9zdm4ucHkKQEAgLTI3Myw5ICsyNzMsMTAgQEAgY2xhc3MgU1ZOKFNDTSwgU1ZO UmVwb3NpdG9yeSk6CiAgICAgICAgIGVsaWYgY2hhbmdlZF9maWxlcyA9PSBOb25lOgogICAgICAg ICAgICAgY2hhbmdlZF9maWxlcyA9IFtdCiAgICAgICAgIHNjcmlwdF9wYXRoID0gc2VsZi5fZmls ZXN5c3RlbS5qb2luKHNlbGYuY2hlY2tvdXRfcm9vdCwgIlRvb2xzIiwgIlNjcmlwdHMiLCAic3Zu LWNyZWF0ZS1wYXRjaCIpCi0gICAgICAgIHJldHVybiBzZWxmLnJ1bihbc2NyaXB0X3BhdGgsICIt LW5vLXN0eWxlIl0gKyBjaGFuZ2VkX2ZpbGVzLAotICAgICAgICAgICAgY3dkPXNlbGYuY2hlY2tv dXRfcm9vdCwgcmV0dXJuX3N0ZGVycj1GYWxzZSwKLSAgICAgICAgICAgIGRlY29kZV9vdXRwdXQ9 RmFsc2UpCisgICAgICAgIHJldHVybiBzZWxmLmZpeF9jaGFuZ2Vsb2dfcGF0Y2goCisgICAgICAg ICAgICAgICAgc2VsZi5ydW4oW3NjcmlwdF9wYXRoLCAiLS1uby1zdHlsZSJdICsgY2hhbmdlZF9m aWxlcywKKyAgICAgICAgICAgICAgICAgICAgY3dkPXNlbGYuY2hlY2tvdXRfcm9vdCwgcmV0dXJu X3N0ZGVycj1GYWxzZSwKKyAgICAgICAgICAgICAgICAgICAgZGVjb2RlX291dHB1dD1GYWxzZSkp CiAKICAgICBkZWYgY29tbWl0dGVyX2VtYWlsX2Zvcl9yZXZpc2lvbihzZWxmLCByZXZpc2lvbik6 CiAgICAgICAgIHJldHVybiBzZWxmLl9ydW5fc3ZuKFsicHJvcGdldCIsICJzdm46YXV0aG9yIiwg Ii0tcmV2cHJvcCIsICItciIsIHJldmlzaW9uXSkucnN0cmlwKCkK