33378 2010-01-08 04:59:36 -0800 webkit-patch: not possible to use build-and-test with local commits 2010-12-10 09:00:35 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 49798 1 eric webkit-unassigned abarth ojan webkit.review.bot oldest_to_newest 178646 0 eric 2010-01-08 04:59:36 -0800 not possible to use build-and-test with local commits even if you pass --no-update and --no-clean it still errors out about local commits. 178701 1 abarth 2010-01-08 10:03:04 -0800 Hum... I'm not sure how to do this without introducing a layering violation. 320083 2 76180 eric 2010-12-10 03:47:40 -0800 Created attachment 76180 Patch 320084 3 eric 2010-12-10 03:48:24 -0800 This should fix the commit-queue failing in "update" due to local commits. We still don't understand how it's ending up there with local commits however! 320085 4 eric 2010-12-10 03:50:14 -0800 Ahha! the commit-queue uses "webkit-patch apply-attachment" which uses: class ApplyAttachment(AbstractPatchApplyingCommand, ProcessAttachmentsMixin): class AbstractPatchApplyingCommand(AbstractPatchSequencingCommand): prepare_steps = [ steps.EnsureLocalCommitIfNeeded, steps.CleanWorkingDirectoryWithLocalCommits, steps.Update, ] main_steps = [ steps.ApplyPatchWithLocalCommit, ] long_help = """Updates the working copy. Downloads and applies the patches, creating local commits if necessary.""" Unclear why. 320086 5 eric 2010-12-10 03:53:07 -0800 We're not passing --local-commit, and --local-commit should default to false, so I don't understand: local_commit = make_option("--local-commit", action="store_true", dest="local_commit", default=False, help="Make a local commit for each applied patch") 320174 6 76180 ojan 2010-12-10 08:29:39 -0800 Comment on attachment 76180 Patch Not sure I understand the larger problem, but this change certainly looks correct. 320194 7 76180 webkit.review.bot 2010-12-10 09:00:29 -0800 Comment on attachment 76180 Patch Clearing flags on attachment: 76180 Committed r73733: <http://trac.webkit.org/changeset/73733> 320195 8 webkit.review.bot 2010-12-10 09:00:35 -0800 All reviewed patches have been landed. Closing bug. 76180 2010-12-10 03:47:40 -0800 2010-12-10 09:00:29 -0800 Patch bug-33378-20101210034739.patch text/plain 4880 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBiN2QwZGNjNGIyNzdkN2EzNTdlYmYxOTJjYmIzYWIzNmY4MjFlNTY5Li41NjcyYmQw ZmRjMGRhZGU3YzIxMGQ3MzcyN2E1NWE0NWRkNDM4MDE4IDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMjAgQEAK IAogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICB3ZWJraXQt cGF0Y2g6IG5vdCBwb3NzaWJsZSB0byB1c2UgYnVpbGQtYW5kLXRlc3Qgd2l0aCBsb2NhbCBjb21t aXRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMzM3 OAorCisgICAgICAgIE1ha2UgLS1uby1jbGVhbiBub3QgZXZlbiBjaGVjayBpZiB3ZSBoYXZlIGxv Y2FsIGNvbW1pdHMuCisgICAgICAgIEl0J3MgdW5jbGVhciB0byBtZSB3aHkgdGhlIGNvZGUgd2Fz IG9yaWdpbmFsbHkgd3JpdHRlbiB0aGlzIHdheS4KKyAgICAgICAgSSB3YXMgdW5hYmxlIHRvIGRp ZyB1cCBhIHJlYXNvbiBmcm9tIHN2biBoaXN0b3J5LgorCisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS90b29sL3N0ZXBzL2NsZWFud29ya2luZ2RpcmVjdG9yeS5weToKKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvY2xlYW53b3JraW5nZGlyZWN0b3J5X3VuaXR0ZXN0LnB5 OiBDb3BpZWQgZnJvbSBXZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvY2xl YW53b3JraW5nZGlyZWN0b3J5LnB5LgorCisyMDEwLTEyLTEwICBFcmljIFNlaWRlbCAgPGVyaWNA d2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwogICAg ICAgICBNb3ZlIGJ1aWxkYm90LnB5IGludG8gaXRzIG93biBtb2R1bGUgc28gd2UgY2FuIHNwbGl0 IGl0IG91dCBpbnRvIG9uZS1maWxlLXBlci1jbGFzcwogICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTA4MDYKIApkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL2NsZWFud29ya2luZ2RpcmVjdG9yeS5weSBiL1dl YktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9jbGVhbndvcmtpbmdkaXJlY3Rv cnkucHkKaW5kZXggZTEzZmJjMjU2ZGYxZWE0MzQ4MmY1ZjQzM2M0YWVlYTFkOWUxZjVkYi4uOWMx NjI0MmVhYTRkZjdhYzc3Nzk4OWUwNjU4OTM3MWI2ZjNjMDEzNCAxMDA2NDQKLS0tIGEvV2ViS2l0 VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL2NsZWFud29ya2luZ2RpcmVjdG9yeS5w eQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvY2xlYW53b3Jr aW5nZGlyZWN0b3J5LnB5CkBAIC00NSw4ICs0NSwxMCBAQCBjbGFzcyBDbGVhbldvcmtpbmdEaXJl Y3RvcnkoQWJzdHJhY3RTdGVwKToKICAgICAgICAgXQogCiAgICAgZGVmIHJ1bihzZWxmLCBzdGF0 ZSk6CisgICAgICAgIGlmIG5vdCBzZWxmLl9vcHRpb25zLmNsZWFuOgorICAgICAgICAgICAgcmV0 dXJuCisgICAgICAgICMgRklYTUU6IFRoaXMgY2hkaXIgc2hvdWxkIG5vdCBiZSBuZWNlc3Nhcnku CiAgICAgICAgIG9zLmNoZGlyKHNlbGYuX3Rvb2wuc2NtKCkuY2hlY2tvdXRfcm9vdCkKICAgICAg ICAgaWYgbm90IHNlbGYuX2FsbG93X2xvY2FsX2NvbW1pdHM6CiAgICAgICAgICAgICBzZWxmLl90 b29sLnNjbSgpLmVuc3VyZV9ub19sb2NhbF9jb21taXRzKHNlbGYuX29wdGlvbnMuZm9yY2VfY2xl YW4pCi0gICAgICAgIGlmIHNlbGYuX29wdGlvbnMuY2xlYW46Ci0gICAgICAgICAgICBzZWxmLl90 b29sLnNjbSgpLmVuc3VyZV9jbGVhbl93b3JraW5nX2RpcmVjdG9yeShmb3JjZV9jbGVhbj1zZWxm Ll9vcHRpb25zLmZvcmNlX2NsZWFuKQorICAgICAgICBzZWxmLl90b29sLnNjbSgpLmVuc3VyZV9j bGVhbl93b3JraW5nX2RpcmVjdG9yeShmb3JjZV9jbGVhbj1zZWxmLl9vcHRpb25zLmZvcmNlX2Ns ZWFuKQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBz L2NsZWFud29ya2luZ2RpcmVjdG9yeV91bml0dGVzdC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvdG9vbC9zdGVwcy9jbGVhbndvcmtpbmdkaXJlY3RvcnlfdW5pdHRlc3QucHkKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMC4uMzZhM2QyYjc2NThmOWZlZjJjMDg1NmRjOTRmMmJjMDcyNDk1NzAzNQotLS0gL2Rl di9udWxsCisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9jbGVh bndvcmtpbmdkaXJlY3RvcnlfdW5pdHRlc3QucHkKQEAgLTAsMCArMSw0OSBAQAorIyBDb3B5cmln aHQgKEMpIDIwMTAgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyMKKyMgUmVkaXN0 cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRo b3V0CisjIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xs b3dpbmcgY29uZGl0aW9ucyBhcmUKKyMgbWV0OgorIworIyAgICAgKiBSZWRpc3RyaWJ1dGlvbnMg b2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorIyBub3RpY2Us IHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisj ICAgICAqIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUg YWJvdmUKKyMgY29weXJpZ2h0IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRo ZSBmb2xsb3dpbmcgZGlzY2xhaW1lcgorIyBpbiB0aGUgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3Ro ZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlCisjIGRpc3RyaWJ1dGlvbi4KKyMgICAgICog TmVpdGhlciB0aGUgbmFtZSBvZiBHb29nbGUgSW5jLiBub3IgdGhlIG5hbWVzIG9mIGl0cworIyBj b250cmlidXRvcnMgbWF5IGJlIHVzZWQgdG8gZW5kb3JzZSBvciBwcm9tb3RlIHByb2R1Y3RzIGRl cml2ZWQgZnJvbQorIyB0aGlzIHNvZnR3YXJlIHdpdGhvdXQgc3BlY2lmaWMgcHJpb3Igd3JpdHRl biBwZXJtaXNzaW9uLgorIworIyBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIFRIRSBDT1BZ UklHSFQgSE9MREVSUyBBTkQgQ09OVFJJQlVUT1JTCisjICJBUyBJUyIgQU5EIEFOWSBFWFBSRVNT IE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UCisjIExJTUlURUQgVE8s IFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZP UgorIyBBIFBBUlRJQ1VMQVIgUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hB TEwgVEhFIENPUFlSSUdIVAorIyBPV05FUiBPUiBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBB TlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwKKyMgU1BFQ0lBTCwgRVhFTVBMQVJZLCBP UiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVAorIyBMSU1JVEVEIFRP LCBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVT RSwKKyMgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVS IENBVVNFRCBBTkQgT04gQU5ZCisjIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09O VFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyMgKElOQ0xVRElORyBORUdMSUdFTkNF IE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCisjIE9GIFRI SVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBE QU1BR0UuCisKK2ltcG9ydCB1bml0dGVzdAorCitmcm9tIHdlYmtpdHB5LnRoaXJkcGFydHkubW9j ayBpbXBvcnQgTW9jaworZnJvbSB3ZWJraXRweS50b29sLm1vY2t0b29sIGltcG9ydCBNb2NrT3B0 aW9ucywgTW9ja1Rvb2wKK2Zyb20gd2Via2l0cHkudG9vbC5zdGVwcy5jbGVhbndvcmtpbmdkaXJl Y3RvcnkgaW1wb3J0IENsZWFuV29ya2luZ0RpcmVjdG9yeQorCisKK2NsYXNzIENsZWFuV29ya2lu Z0RpcmVjdG9yeVRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgorICAgIGRlZiB0ZXN0X3J1bihzZWxm KToKKyAgICAgICAgdG9vbCA9IE1vY2tUb29sKCkKKyAgICAgICAgc3RlcCA9IENsZWFuV29ya2lu Z0RpcmVjdG9yeSh0b29sLCBNb2NrT3B0aW9ucyhjbGVhbj1UcnVlLCBmb3JjZV9jbGVhbj1GYWxz ZSkpCisgICAgICAgIHN0ZXAucnVuKHt9KQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHRvb2wu X3NjbS5lbnN1cmVfbm9fbG9jYWxfY29tbWl0cy5jYWxsX2NvdW50LCAxKQorICAgICAgICBzZWxm LmFzc2VydEVxdWFsKHRvb2wuX3NjbS5lbnN1cmVfY2xlYW5fd29ya2luZ19kaXJlY3RvcnkuY2Fs bF9jb3VudCwgMSkKKworICAgIGRlZiB0ZXN0X25vX2NsZWFuKHNlbGYpOgorICAgICAgICB0b29s ID0gTW9ja1Rvb2woKQorICAgICAgICBzdGVwID0gQ2xlYW5Xb3JraW5nRGlyZWN0b3J5KHRvb2ws IE1vY2tPcHRpb25zKGNsZWFuPUZhbHNlKSkKKyAgICAgICAgc3RlcC5ydW4oe30pCisgICAgICAg IHNlbGYuYXNzZXJ0RXF1YWwodG9vbC5fc2NtLmVuc3VyZV9ub19sb2NhbF9jb21taXRzLmNhbGxf Y291bnQsIDApCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwodG9vbC5fc2NtLmVuc3VyZV9jbGVh bl93b3JraW5nX2RpcmVjdG9yeS5jYWxsX2NvdW50LCAwKQo=