34187 2010-01-26 15:44:46 -0800 webkit-patch commit-queue should land patches optimistically 2010-03-31 12:32:42 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 eric webkit-unassigned abarth oldest_to_newest 184798 0 eric 2010-01-26 15:44:46 -0800 webkit-patch commit-queue should land patches optimistically Right now it builds and tests tip-of-tree first, and if the tests pass, applies the patch and builds and tests with the patch. We should instead apply the patch, build and test, and if they pass land. If tests didn't pass, try trunk. If trunk passed, reject the patch. Otherwise, spin. Adam gets all the credit for this masterful idea. Should make the commit-queue *much* faster. 206640 1 52194 abarth 2010-03-31 12:27:09 -0700 Created attachment 52194 Patch 206642 2 52194 eric 2010-03-31 12:29:49 -0700 Comment on attachment 52194 Patch Slightly confusing, but maximally awesome. 206646 3 abarth 2010-03-31 12:32:42 -0700 Committed r56857: <http://trac.webkit.org/changeset/56857> 52194 2010-03-31 12:27:09 -0700 2010-03-31 12:29:49 -0700 Patch bug-34187-20100331122707.patch text/plain 4948 abarth ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBjNDQ1ZTIyLi40YjA4NTZhIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTAtMDMt MzEgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICB3ZWJraXQtcGF0Y2ggY29tbWl0LXF1ZXVlIHNo b3VsZCBsYW5kIHBhdGNoZXMgb3B0aW1pc3RpY2FsbHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM0MTg3CisKKyAgICAgICAgVGhpcyBwYXRjaCBhZGRz IGFuIG9wdGltaXN0aWMgcGF0aCB0byBjb21taXQtcXVldWUgYW5kIGEgImZhaWwgdHdpY2UiCisg ICAgICAgIHJlcXVpcmVtZW50IGZvciByZWplY3RpbmcgcGF0Y2hlcy4gIFRoYXQgbWVhbnMgd2Un bGwgbGFuZCBnb29kIHBhdGNoZXMKKyAgICAgICAgZmFzdGVyICh2aWEgdGhlIG9wdG1pc3RpYyBm aXJzdCBydW4pIGFuZCB3ZSdsbCByZWplY3QgbWFueSBmZXdlcgorICAgICAgICBwYXRjaGVzIGR1 ZSB0byBmbGFreSB0ZXN0cy4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21t YW5kcy9xdWV1ZXMucHk6CisKIDIwMTAtMDMtMzEgIERpZWdvIEdvbnphbGV6ICA8ZGllZ28uZ29u emFsZXpAb3BlbmJvc3NhLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRoIFJvaGRl IENocmlzdGlhbnNlbi4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv dG9vbC9jb21tYW5kcy9xdWV1ZXMucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rv b2wvY29tbWFuZHMvcXVldWVzLnB5CmluZGV4IDliYzUzZDMuLmQ5OWRiYWQgMTAwNjQ0Ci0tLSBh L1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9xdWV1ZXMucHkKKysr IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3F1ZXVlcy5weQpA QCAtMTc2LDcgKzE3NiwxMyBAQCBjbGFzcyBDb21taXRRdWV1ZShBYnN0cmFjdFBhdGNoUXVldWUs IFN0ZXBTZXF1ZW5jZUVycm9ySGFuZGxlcik6CiAKICAgICBkZWYgX2Nhbl9idWlsZF9hbmRfdGVz dChzZWxmKToKICAgICAgICAgdHJ5OgotICAgICAgICAgICAgc2VsZi5ydW5fd2Via2l0X3BhdGNo KFsiYnVpbGQtYW5kLXRlc3QiLCAiLS1mb3JjZS1jbGVhbiIsICItLW5vbi1pbnRlcmFjdGl2ZSIs ICItLWJ1aWxkLXN0eWxlPWJvdGgiLCAiLS1xdWlldCJdKQorICAgICAgICAgICAgc2VsZi5ydW5f d2Via2l0X3BhdGNoKFsKKyAgICAgICAgICAgICAgICAiYnVpbGQtYW5kLXRlc3QiLAorICAgICAg ICAgICAgICAgICItLWZvcmNlLWNsZWFuIiwKKyAgICAgICAgICAgICAgICAiLS1ub24taW50ZXJh Y3RpdmUiLAorICAgICAgICAgICAgICAgICItLW5vLXVwZGF0ZSIsCisgICAgICAgICAgICAgICAg Ii0tYnVpbGQtc3R5bGU9Ym90aCIsCisgICAgICAgICAgICAgICAgIi0tcXVpZXQiXSkKICAgICAg ICAgZXhjZXB0IFNjcmlwdEVycm9yLCBlOgogICAgICAgICAgICAgc2VsZi5fdXBkYXRlX3N0YXR1 cygiVW5hYmxlIHRvIHN1Y2Nlc3NmdWxseSBidWlsZCBhbmQgdGVzdCIsIE5vbmUpCiAgICAgICAg ICAgICByZXR1cm4gRmFsc2UKQEAgLTE5NCw0MSArMjAwLDU3IEBAIGNsYXNzIENvbW1pdFF1ZXVl KEFic3RyYWN0UGF0Y2hRdWV1ZSwgU3RlcFNlcXVlbmNlRXJyb3JIYW5kbGVyKToKICAgICAgICAg aWYgbm90IHBhdGNoLmlzX3JvbGxvdXQoKToKICAgICAgICAgICAgIGlmIG5vdCBzZWxmLl9idWls ZGVyc19hcmVfZ3JlZW4oKToKICAgICAgICAgICAgICAgICByZXR1cm4gRmFsc2UKLSAgICAgICAg ICAgIGlmIG5vdCBzZWxmLl9jYW5fYnVpbGRfYW5kX3Rlc3QoKToKLSAgICAgICAgICAgICAgICBy ZXR1cm4gRmFsc2UKLSAgICAgICAgICAgIGlmIG5vdCBzZWxmLl9idWlsZGVyc19hcmVfZ3JlZW4o KToKLSAgICAgICAgICAgICAgICByZXR1cm4gRmFsc2UKICAgICAgICAgc2VsZi5fdXBkYXRlX3N0 YXR1cygiTGFuZGluZyBwYXRjaCIsIHBhdGNoKQogICAgICAgICByZXR1cm4gVHJ1ZQogCi0gICAg ZGVmIHByb2Nlc3Nfd29ya19pdGVtKHNlbGYsIHBhdGNoKToKKyAgICBkZWYgX2xhbmQoc2VsZiwg cGF0Y2gsIGZpcnN0X3J1bj1GYWxzZSk6CiAgICAgICAgIHRyeToKLSAgICAgICAgICAgIHNlbGYu X2NjX3dhdGNoZXJzKHBhdGNoLmJ1Z19pZCgpKQogICAgICAgICAgICAgYXJncyA9IFsKICAgICAg ICAgICAgICAgICAibGFuZC1hdHRhY2htZW50IiwKICAgICAgICAgICAgICAgICAiLS1mb3JjZS1j bGVhbiIsCiAgICAgICAgICAgICAgICAgIi0tbm9uLWludGVyYWN0aXZlIiwKLSAgICAgICAgICAg ICAgICAiLS1wYXJlbnQtY29tbWFuZD1jb21taXQtcXVldWUiLAogICAgICAgICAgICAgICAgICIt LWJ1aWxkLXN0eWxlPWJvdGgiLAogICAgICAgICAgICAgICAgICItLXF1aWV0IiwKICAgICAgICAg ICAgICAgICBwYXRjaC5pZCgpCiAgICAgICAgICAgICBdCisgICAgICAgICAgICBpZiBub3QgZmly c3RfcnVuOgorICAgICAgICAgICAgICAgICMgVGhlIGZpcnN0IHRpbWUgdGhyb3VnaCwgd2UgZG9u J3QgcmVqZWN0IHRoZSBwYXRjaCBmcm9tIHRoZQorICAgICAgICAgICAgICAgICMgY29tbWl0IHF1 ZXVlIGJlY2F1c2Ugd2Ugd2FudCB0byBtYWtlIHN1cmUgd2UgY2FuIGJ1aWxkIGFuZAorICAgICAg ICAgICAgICAgICMgdGVzdCBvdXJzZWx2ZXMuIEhvd2V2ZXIsIHRoZSBzZWNvbmQgdGltZSB0aHJv dWdoLCB3ZQorICAgICAgICAgICAgICAgICMgcmVnaXN0ZXIgb3Vyc2VsdmVzIGFzIHRoZSBwYXJl bnQtY29tbWFuZCBzbyB3ZSBjYW4gcmVqZWN0CisgICAgICAgICAgICAgICAgIyB0aGUgcGF0Y2gg b24gZmFpbHVyZS4KKyAgICAgICAgICAgICAgICBhcmdzLmFwcGVuZCgiLS1wYXJlbnQtY29tbWFu ZD1jb21taXQtcXVldWUiKQorICAgICAgICAgICAgICAgICMgVGhlIHNlY29uZCB0aW1lIHRocm91 Z2gsIHdlIGFsc28gZG9uJ3Qgd2FudCB0byB1cGRhdGUgc28gd2UKKyAgICAgICAgICAgICAgICAj IGtub3cgd2UncmUgdGVzdGluZyB0aGUgc2FtZSByZXZpc2lvbiB0aGF0IHdlIHN1Y2Nlc3NmdWxs eQorICAgICAgICAgICAgICAgICMgYnVpbHQgYW5kIHRlc3RlZC4KKyAgICAgICAgICAgICAgICBh cmdzLmFwcGVuZCgiLS1uby11cGRhdGUiKQogICAgICAgICAgICAgaWYgcGF0Y2guaXNfcm9sbG91 dCgpOgogICAgICAgICAgICAgICAgICMgV2UgbmVlZCB0byBpZ25vcmUgdGhlIGJ1aWxkZXJzIHdo ZW4gbGFuZGluZyBhIHJvbGxvdXQKICAgICAgICAgICAgICAgICAjIGJlY2F1c2UgdGhleSdyZSBw cm9iYWJseSByZWQuCiAgICAgICAgICAgICAgICAgYXJncy5hcHBlbmQoIi0taWdub3JlLWJ1aWxk ZXJzIikKLSAgICAgICAgICAgIGVsc2U6Ci0gICAgICAgICAgICAgICAgIyBXZSBwYXNzIC0tbm8t dXBkYXRlIGluIHRoZSBub3JtYWwgKG5vbi1yb2xsb3V0KSBjYXNlCi0gICAgICAgICAgICAgICAg IyBiZWNhdXNlIHdlJ3ZlIGFscmVhZHkgdmFsaWRhdGVkIHRoYXQgdGhlIGN1cnJlbnQgcmV2aXNp b24KLSAgICAgICAgICAgICAgICAjIGFjdHVhbGx5IGJ1aWxkcyBhbmQgcGFzc2VzIHRoZSB0ZXN0 cy4gIElmIHdlIHVwZGF0ZSwgd2UgcmlzawotICAgICAgICAgICAgICAgICMgbW92aW5nIHRvIGEg cmV2aXNpb24gdGhhdCBkb2Vzbid0IQotICAgICAgICAgICAgICAgIGFyZ3MuYXBwZW5kKCItLW5v LXVwZGF0ZSIpCiAgICAgICAgICAgICBzZWxmLnJ1bl93ZWJraXRfcGF0Y2goYXJncykKICAgICAg ICAgICAgIHNlbGYuX2RpZF9wYXNzKHBhdGNoKQorICAgICAgICAgICAgcmV0dXJuIFRydWUKICAg ICAgICAgZXhjZXB0IFNjcmlwdEVycm9yLCBlOgorICAgICAgICAgICAgaWYgZmlyc3RfcnVuOgor ICAgICAgICAgICAgICAgIHJldHVybiBGYWxzZQogICAgICAgICAgICAgc2VsZi5fZGlkX2ZhaWwo cGF0Y2gpCiAgICAgICAgICAgICByYWlzZSBlCiAKKyAgICBkZWYgcHJvY2Vzc193b3JrX2l0ZW0o c2VsZiwgcGF0Y2gpOgorICAgICAgICBzZWxmLl9jY193YXRjaGVycyhwYXRjaC5idWdfaWQoKSkK KyAgICAgICAgaWYgbm90IHNlbGYuX2xhbmQocGF0Y2gsIGZpcnN0X3J1bj1UcnVlKToKKyAgICAg ICAgICAgICMgVGhlIHBhdGNoIGZhaWxlZCB0byBsYW5kLCBidXQgdGhlIGJvdHMgd2VyZSBncmVl bi4gSXQncyBwb3NzaWJsZQorICAgICAgICAgICAgIyB0aGF0IHRoZSBib3RzIHdlcmUgYmVoaW5k LiBUbyBjaGVjayB0aGF0IGNhc2UsIHdlIHRyeSB0byBidWlsZCBhbmQKKyAgICAgICAgICAgICMg dGVzdCBvdXJzZWx2ZXMuCisgICAgICAgICAgICBpZiBub3Qgc2VsZi5fY2FuX2J1aWxkX2FuZF90 ZXN0KCk6CisgICAgICAgICAgICAgICAgcmV0dXJuCisgICAgICAgICAgICAjIEh1bSwgbG9va3Mg bGlrZSB0aGUgcGF0Y2ggaXMgYWN0dWFsbHkgYmFkLiBPZiBjb3Vyc2UsIHdlIGNvdWxkCisgICAg ICAgICAgICAjIGhhdmUgYmVlbiBiaXR0ZW4gYnkgYSBmbGFreSB0ZXN0IHRoZSBmaXJzdCB0aW1l IGFyb3VuZC4gIFdlIHRyeQorICAgICAgICAgICAgIyB0byBsYW5kIGFnYWluLiAgSWYgaXQgZmFp bHMgYSBzZWNvbmQgdGltZSwgd2UncmUgcHJldHR5IHN1cmUgaXRzCisgICAgICAgICAgICAjIGEg YmFkIHRlc3QgYW5kIHJlIGNhbiByZWplY3QgaXQgb3V0cmlnaHQuCisgICAgICAgICAgICBzZWxm Ll9sYW5kKHBhdGNoKQorCiAgICAgZGVmIGhhbmRsZV91bmV4cGVjdGVkX2Vycm9yKHNlbGYsIHBh dGNoLCBtZXNzYWdlKToKICAgICAgICAgc2VsZi5jb21taXR0ZXJfdmFsaWRhdG9yLnJlamVjdF9w YXRjaF9mcm9tX2NvbW1pdF9xdWV1ZShwYXRjaC5pZCgpLCBtZXNzYWdlKQogCg==