28436 2009-08-18 14:19:57 -0700 commit-queue/bugzilla-tool can get wedged if git is mid-rebase 2009-08-19 18:58:33 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 28445 1 eric webkit-unassigned abarth oldest_to_newest 141225 0 eric 2009-08-18 14:19:57 -0700 commit-queue/bugzilla-tool can get wedged if git is mid-rebase --force-clean should also do a git rebase --abort it seems. It seems that I cannot create a rebase-apply directory, and I wonder if you are in the middle of patch application or another rebase. If that is not the case, please rm -fr /Users/eseidel/Projects/WebKit2/.git/rebase-apply and run me again. I am stopping in case you still have something valuable there. rebase refs/remotes/trunk: command returned error: 1 141233 1 abarth 2009-08-18 14:25:01 -0700 I like how git talks in the first person. 141247 2 35079 eric 2009-08-18 14:39:52 -0700 Created attachment 35079 Testing this local change for now 141253 3 abarth 2009-08-18 14:42:55 -0700 git rebase --abort isn't better here? rm -rf is scary. 141257 4 eric 2009-08-18 14:46:34 -0700 I could use "git rebase --abort". But it prints "No rebase in progress?" and exits "1" if there is no rebase in progress. There doesn't seem to be a way to detect if a rebase is in progress. I guess I could check for the existance of that file. Not sure yet. 141659 5 35163 eric 2009-08-19 17:25:50 -0700 Created attachment 35163 Patch v1 141686 6 35163 abarth 2009-08-19 18:35:06 -0700 Comment on attachment 35163 Patch v1 Looks good. Too bad there isn't a better way to tell if a rebase is in progress. 141688 7 35163 eric 2009-08-19 18:41:31 -0700 Comment on attachment 35163 Patch v1 You should always feel free to mark my patches cq+. I'll mark them cq- if needed. 141693 8 abarth 2009-08-19 18:46:03 -0700 I was worried about the improper ChangeLog diff, but maybe you've fixed that bug. 141694 9 eric 2009-08-19 18:47:33 -0700 Ah. Well, I guess we'll see.. I think if anything it will get rejected. svn-apply should be smart enough I think. 141699 10 35163 eric 2009-08-19 18:58:26 -0700 Comment on attachment 35163 Patch v1 Clearing flags on attachment: 35163 Committed r47540: <http://trac.webkit.org/changeset/47540> 141700 11 eric 2009-08-19 18:58:33 -0700 All reviewed patches have been landed. Closing bug. 35079 2009-08-18 14:39:52 -0700 2009-08-19 17:25:46 -0700 Testing this local change for now bug-28436-20090818143951.patch text/plain 685 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9zY20ucHkgYi9XZWJLaXRU b29scy9TY3JpcHRzL21vZHVsZXMvc2NtLnB5CmluZGV4IGViMTQwMGQuLmQ2ZDI0NDYgMTAwNjQ0 Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9zY20ucHkKKysrIGIvV2ViS2l0VG9v bHMvU2NyaXB0cy9tb2R1bGVzL3NjbS5weQpAQCAtMzE3LDcgKzMxNyw5IEBAIGNsYXNzIEdpdChT Q00pOgogICAgIGRlZiBjbGVhbl93b3JraW5nX2RpcmVjdG9yeShzZWxmKToKICAgICAgICAgIyBD b3VsZCBydW4gZ2l0IGNsZWFuIGhlcmUgdG9vLCBidXQgdGhhdCB3b3VsZG4ndCBtYXRjaCB3b3Jr aW5nX2RpcmVjdG9yeV9pc19jbGVhbgogICAgICAgICBzZWxmLnJ1bl9jb21tYW5kKFsnZ2l0Jywg J3Jlc2V0JywgJy0taGFyZCcsICdIRUFEJ10pCi0gICAgCisgICAgICAgICMgTWFrZSBzdXJlIHdl IGRvbid0IGhhdmUgYW55IHJlYmFzZXMgaW4gcHJvZ3Jlc3MuCisgICAgICAgIHNlbGYucnVuX2Nv bW1hbmQoWydybScsJy1mcicsJy5naXQvcmViYXNlLWFwcGx5J10pCisKICAgICBkZWYgdXBkYXRl X3dlYmtpdChzZWxmKToKICAgICAgICAgIyBGSVhNRTogU2hvdWxkIHByb2JhYmx5IGNhbGwgdXBk YXRlLXdlYmtpdCwgbm8/CiAgICAgICAgIGxvZygiVXBkYXRpbmcgd29ya2luZyBkaXJlY3Rvcnki KQ== 35163 2009-08-19 17:25:50 -0700 2009-08-19 18:58:26 -0700 Patch v1 bug-28436-20090819172550.patch text/plain 6260 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAwZjk5MjMwLi4xZmZkMmVkIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjAgQEAKIDIwMDktMDgt MTkgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGNvbW1pdC1xdWV1ZS9idWd6aWxsYS10b29sIGNh biBnZXQgd2VkZ2VkIGlmIGdpdCBpcyBtaWQtcmViYXNlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yODQzNgorCisgICAgICAgIE1ha2UgY2xlYW5fd29y a2luZ19kaXJlY3RvcnkgY2FuY2VsIHJlYmFzZXMgdG9vIChldmVuIHRob3VnaCB0aGF0J3MgYSBi aXQgb2YgYSBoYWNrKS4KKyAgICAgICAgVGhpcyBjb2RlIHdpbGwgb25seSBldmVyIGJlIHJ1biB3 aGVuIC0tZm9yY2UtY2xlYW4gaXMgcGFzc2VkLgorCisgICAgICAgIEkgYWxzbyBhZGRlZCBhIG5l dyB1bml0IHRlc3QgdG8gbWFrZSBzdXJlIHRoaXMgY29kZSBhY3R1YWxseSB3b3Jrcy4gOikKKwor ICAgICAgICAqIFNjcmlwdHMvbW9kdWxlcy9zY20ucHk6CisgICAgICAgICogU2NyaXB0cy9tb2R1 bGVzL3NjbV91bml0dGVzdC5weToKKworMjAwOS0wOC0xOSAgRXJpYyBTZWlkZWwgIDxlcmljQHdl YmtpdC5vcmc+CisKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KIAogICAgICAgICBi dWd6aWxsYS10b29sIG5lZWRzIGEgd2F5IHRvIGFzayBidWlsZC53ZWJraXQub3JnIGlmIHRoZSBi b3RzIGFyZSBwYXNzaW5nCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMv c2NtLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL3NjbS5weQppbmRleCAxMGI3OTlh Li45MjI1NDFlIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvc2NtLnB5 CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9zY20ucHkKQEAgLTI4Niw3ICsyODYs NyBAQCBjbGFzcyBTVk4oU0NNKToKIGNsYXNzIEdpdChTQ00pOgogICAgIGRlZiBfX2luaXRfXyhz ZWxmLCBjd2QsIGRyeXJ1bj1GYWxzZSk6CiAgICAgICAgIFNDTS5fX2luaXRfXyhzZWxmLCBjd2Qs IGRyeXJ1bikKLSAgICAKKwogICAgIEBjbGFzc21ldGhvZAogICAgIGRlZiBpbl93b3JraW5nX2Rp cmVjdG9yeShjbHMsIHBhdGgpOgogICAgICAgICByZXR1cm4gY2xzLnJ1bl9jb21tYW5kKFsnZ2l0 JywgJ3Jldi1wYXJzZScsICctLWlzLWluc2lkZS13b3JrLXRyZWUnXSwgY3dkPXBhdGgpID09ICJ0 cnVlIgpAQCAtMzEwLDE1ICszMTAsMjEgQEAgY2xhc3MgR2l0KFNDTSk6CiAgICAgZGVmIGxvY2Fs X2NvbW1pdHMoc2VsZik6CiAgICAgICAgIHJldHVybiBzZWxmLnJ1bl9jb21tYW5kKFsnZ2l0Jywg J2xvZycsICctLXByZXR0eT1vbmVsaW5lJywgJ0hFQUQuLi50cnVuayddKS5zcGxpdGxpbmVzKCkK IAorICAgIGRlZiByZWJhc2VfaW5fcHJvZ3Jlc3Moc2VsZik6CisgICAgICAgIHJldHVybiBvcy5w YXRoLmV4aXN0cyhvcy5wYXRoLmpvaW4oc2VsZi5jaGVja291dF9yb290LCAnLmdpdC9yZWJhc2Ut YXBwbHknKSkKKwogICAgIGRlZiB3b3JraW5nX2RpcmVjdG9yeV9pc19jbGVhbihzZWxmKToKICAg ICAgICAgcmV0dXJuIHNlbGYucnVuX2NvbW1hbmQoWydnaXQnLCAnZGlmZi1pbmRleCcsICdIRUFE J10pID09ICIiCi0gICAgCisKICAgICBkZWYgY2xlYW5fd29ya2luZ19kaXJlY3Rvcnkoc2VsZik6 CiAgICAgICAgICMgQ291bGQgcnVuIGdpdCBjbGVhbiBoZXJlIHRvbywgYnV0IHRoYXQgd291bGRu J3QgbWF0Y2ggd29ya2luZ19kaXJlY3RvcnlfaXNfY2xlYW4KICAgICAgICAgc2VsZi5ydW5fY29t bWFuZChbJ2dpdCcsICdyZXNldCcsICctLWhhcmQnLCAnSEVBRCddKQotICAgIAorICAgICAgICAj IEFib3J0aW5nIHJlYmFzZSBldmVuIHRob3VnaCB0aGlzIGRvZXMgbm90IG1hdGNoIHdvcmtpbmdf ZGlyZWN0b3J5X2lzX2NsZWFuCisgICAgICAgIGlmIHNlbGYucmViYXNlX2luX3Byb2dyZXNzKCk6 CisgICAgICAgICAgICBzZWxmLnJ1bl9jb21tYW5kKFsnZ2l0JywgJ3JlYmFzZScsICctLWFib3J0 J10pCisKICAgICBkZWYgdXBkYXRlX3dlYmtpdChzZWxmKToKLSAgICAgICAgIyBGSVhNRTogU2hv dWxkIHByb2JhYmx5IGNhbGwgdXBkYXRlLXdlYmtpdCwgbm8/CisgICAgICAgICMgRklYTUU6IENh bGwgdXBkYXRlLXdlYmtpdCBvbmNlIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yNzE2MiBpcyBmaXhlZC4KICAgICAgICAgbG9nKCJVcGRhdGluZyB3b3JraW5nIGRpcmVj dG9yeSIpCiAgICAgICAgIHNlbGYucnVuX2NvbW1hbmQoWydnaXQnLCAnc3ZuJywgJ3JlYmFzZSdd KQogCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvc2NtX3VuaXR0ZXN0 LnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL3NjbV91bml0dGVzdC5weQppbmRleCA1 YmYyNzI2Li4yODFlNjkzIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMv c2NtX3VuaXR0ZXN0LnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9zY21fdW5p dHRlc3QucHkKQEAgLTM2LDggKzM2LDIwIEBAIGZyb20gbW9kdWxlcy5zY20gaW1wb3J0IGRldGVj dF9zY21fc3lzdGVtLCBTQ00sIFNjcmlwdEVycm9yCiAjIEV2ZW50dWFsbHkgd2Ugd2lsbCB3YW50 IHRvIHdyaXRlIHRlc3RzIHdoaWNoIHdvcmsgZm9yIGJvdGggc2Ntcy4gKGxpa2UgdXBkYXRlX3dl YmtpdCwgY2hhbmdlZF9maWxlcywgZXRjLikKICMgUGVyaGFwcyB0aHJvdWdoIHNvbWUgU0NNVGVz dCBiYXNlLWNsYXNzIHdoaWNoIGJvdGggU1ZOVGVzdCBhbmQgR2l0VGVzdCBpbmhlcml0IGZyb20u CiAKLWRlZiBydW4oYXJncyk6Ci0gICAgU0NNLnJ1bl9jb21tYW5kKGFyZ3MpCitkZWYgcnVuKGFy Z3MsIGN3ZD1Ob25lKToKKyAgICBTQ00ucnVuX2NvbW1hbmQoYXJncywgY3dkPWN3ZCkKKworZGVm IHJ1bl9zaWxlbnQoYXJncywgY3dkPU5vbmUpOgorICAgIHByb2Nlc3MgPSBzdWJwcm9jZXNzLlBv cGVuKGFyZ3MsIHN0ZG91dD1zdWJwcm9jZXNzLlBJUEUsIHN0ZGVycj1zdWJwcm9jZXNzLlBJUEUs IGN3ZD1jd2QpCisgICAgcHJvY2Vzcy5jb21tdW5pY2F0ZSgpICMgaWdub3JlIG91dHB1dAorICAg IGV4aXRfY29kZSA9IHByb2Nlc3Mud2FpdCgpCisgICAgaWYgZXhpdF9jb2RlOgorICAgICAgICBy YWlzZSBTY3JpcHRFcnJvcignRmFpbGVkIHRvIHJ1biAiJXMiICBleGl0X2NvZGU6ICVkICBjd2Q6 ICVzJyAlIChhcmdzLCBleGl0X2NvZGUsIGN3ZCkpCisKK2RlZiB3cml0ZV9pbnRvX2ZpbGVfYXRf cGF0aChmaWxlX3BhdGgsIGNvbnRlbnRzKToKKyAgICBmaWxlID0gb3BlbihmaWxlX3BhdGgsICd3 JykKKyAgICBmaWxlLndyaXRlKGNvbnRlbnRzKQorICAgIGZpbGUuY2xvc2UoKQogCiAjIEV4aXN0 cyB0byBzaGFyZSBzdm4gcmVwb3NpdG9yeSBjcmVhdGlvbiBjb2RlIGJldHdlZW4gdGhlIGdpdCBh bmQgc3ZuIHRlc3RzCiBjbGFzcyBTVk5UZXN0UmVwb3NpdG9yeToKQEAgLTEwMSwxMSArMTEzLDgg QEAgY2xhc3MgR2l0VGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAKICAgICBkZWYgX3NldHVwX2dp dF9jbG9uZV9vZl9zdm5fcmVwb3NpdG9yeShzZWxmKToKICAgICAgICAgc2VsZi5naXRfY2hlY2tv dXRfcGF0aCA9IHRlbXBmaWxlLm1rZHRlbXAoc3VmZml4PSJnaXRfdGVzdF9jaGVja291dCIpCi0g ICAgICAgICMgLS1xdWlldCBkb2Vzbid0IG1ha2UgZ2l0IHN2biBzaWxlbnQsIHNvIHdlIHJlZGly ZWN0IG91dHB1dAotICAgICAgICBhcmdzID0gWydnaXQnLCAnc3ZuJywgJy0tcXVpZXQnLCAnY2xv bmUnLCBzZWxmLnN2bl9yZXBvX3VybCwgc2VsZi5naXRfY2hlY2tvdXRfcGF0aF0KLSAgICAgICAg Z2l0X3N2bl9jbG9uZSA9IHN1YnByb2Nlc3MuUG9wZW4oYXJncywgc3Rkb3V0PXN1YnByb2Nlc3Mu UElQRSwgc3RkZXJyPXN1YnByb2Nlc3MuUElQRSkKLSAgICAgICAgZ2l0X3N2bl9jbG9uZS5jb21t dW5pY2F0ZSgpICMgaWdub3JlIG91dHB1dAotICAgICAgICBnaXRfc3ZuX2Nsb25lLndhaXQoKQor ICAgICAgICAjIC0tcXVpZXQgZG9lc24ndCBtYWtlIGdpdCBzdm4gc2lsZW50LCBzbyB3ZSB1c2Ug cnVuX3NpbGVudCB0byByZWRpcmVjdCBvdXRwdXQKKyAgICAgICAgcnVuX3NpbGVudChbJ2dpdCcs ICdzdm4nLCAnLS1xdWlldCcsICdjbG9uZScsIHNlbGYuc3ZuX3JlcG9fdXJsLCBzZWxmLmdpdF9j aGVja291dF9wYXRoXSkKIAogICAgIGRlZiBfdGVhcl9kb3duX2dpdF9jbG9uZV9vZl9zdm5fcmVw b3NpdG9yeShzZWxmKToKICAgICAgICAgcnVuKFsncm0nLCAnLXJmJywgc2VsZi5naXRfY2hlY2tv dXRfcGF0aF0pCkBAIC0xMjQsMTMgKzEzMywzNSBAQCBjbGFzcyBHaXRUZXN0KHVuaXR0ZXN0LlRl c3RDYXNlKToKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzY20uZGlzcGxheV9uYW1lKCksICJn aXQiKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHNjbS5zdXBwb3J0c19sb2NhbF9jb21taXRz KCksIFRydWUpCiAKLSAgICBkZWYgdGVzdF9jb21taXRpc2hfcGFyc2luZyhzZWxmKToKKyAgICBk ZWYgdGVzdF9yZWJhc2VfaW5fcHJvZ3Jlc3Moc2VsZik6CisgICAgICAgIHN2bl90ZXN0X2ZpbGUg PSBvcy5wYXRoLmpvaW4oc2VsZi5zdm5fY2hlY2tvdXRfcGF0aCwgJ3Rlc3RfZmlsZScpCisgICAg ICAgIHdyaXRlX2ludG9fZmlsZV9hdF9wYXRoKHN2bl90ZXN0X2ZpbGUsICJzdm5fY2hlY2tvdXQi KQorICAgICAgICBydW4oWydzdm4nLCAnY29tbWl0JywgJy0tbWVzc2FnZScsICdjb21taXQgdG8g Y29uZmxpY3Qgd2l0aCBnaXQgY29tbWl0J10sIGN3ZD1zZWxmLnN2bl9jaGVja291dF9wYXRoKQor CisgICAgICAgIGdpdF90ZXN0X2ZpbGUgPSBvcy5wYXRoLmpvaW4oc2VsZi5naXRfY2hlY2tvdXRf cGF0aCwgJ3Rlc3RfZmlsZScpCisgICAgICAgIHdyaXRlX2ludG9fZmlsZV9hdF9wYXRoKGdpdF90 ZXN0X2ZpbGUsICJnaXRfY2hlY2tvdXQiKQorICAgICAgICBydW4oWydnaXQnLCAnY29tbWl0Jywg Jy1hJywgJy1tJywgJ2NvbW1pdCB0byBiZSB0aHJvd24gYXdheSBieSByZWJhc2UgYWJvcnQnXSkK KworICAgICAgICAjIC0tcXVpZXQgZG9lc24ndCBtYWtlIGdpdCBzdm4gc2lsZW50LCBzbyB1c2Ug cnVuX3NpbGVudCB0byByZWRpcmVjdCBvdXRwdXQKKyAgICAgICAgc2VsZi5hc3NlcnRSYWlzZXMo U2NyaXB0RXJyb3IsIHJ1bl9zaWxlbnQsIFsnZ2l0JywgJ3N2bicsICctLXF1aWV0JywgJ3JlYmFz ZSddKSAjIFdpbGwgZmFpbCBkdWUgdG8gYSBjb25mbGljdCBsZWF2aW5nIHVzIG1pZC1yZWJhc2Uu CisKICAgICAgICAgc2NtID0gZGV0ZWN0X3NjbV9zeXN0ZW0oc2VsZi5naXRfY2hlY2tvdXRfcGF0 aCkKKyAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHNjbS5yZWJhc2VfaW5fcHJvZ3Jlc3MoKSkKIAor ICAgICAgICAjIE1ha2Ugc3VyZSBvdXIgY2xlYW51cCB3b3Jrcy4KKyAgICAgICAgc2NtLmNsZWFu X3dvcmtpbmdfZGlyZWN0b3J5KCkKKyAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShzY20ucmViYXNl X2luX3Byb2dyZXNzKCkpCisKKyAgICAgICAgIyBNYWtlIHN1cmUgY2xlYW51cCBkb2Vzbid0IHRo cm93IHdoZW4gbm8gcmViYXNlIGlzIGluIHByb2dyZXNzLgorICAgICAgICBzY20uY2xlYW5fd29y a2luZ19kaXJlY3RvcnkoKQorCisgICAgZGVmIHRlc3RfY29tbWl0aXNoX3BhcnNpbmcoc2VsZik6 CisgICAgICAgIHNjbSA9IGRldGVjdF9zY21fc3lzdGVtKHNlbGYuZ2l0X2NoZWNrb3V0X3BhdGgp CisgICAgCiAgICAgICAgICMgTXVsdGlwbGUgcmV2aXNpb25zIGFyZSBjaGVycnktcGlja2VkLgog ICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGxlbihzY20uY29tbWl0X2lkc19mcm9tX2NvbW1pdGlz aF9hcmd1bWVudHMoWydIRUFEfjInXSkpLCAxKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGxl bihzY20uY29tbWl0X2lkc19mcm9tX2NvbW1pdGlzaF9hcmd1bWVudHMoWydIRUFEJywgJ0hFQUR+ MiddKSksIDIpCi0KKyAgICAKICAgICAgICAgIyAuLi4gaXMgYW4gaW52YWxpZCByYW5nZSBzcGVj aWZpZXIKICAgICAgICAgc2VsZi5hc3NlcnRSYWlzZXMoU2NyaXB0RXJyb3IsIHNjbS5jb21taXRf aWRzX2Zyb21fY29tbWl0aXNoX2FyZ3VtZW50cywgWyd0cnVuay4uLkhFQUQnXSk=