31734 2009-11-20 11:33:38 -0800 REGRESSION(r51230): commit-queue made a non-sensical rejection during git svn dcommit 2009-11-26 08:54:05 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 29914 1 eric webkit-unassigned abarth zoltan oldest_to_newest 165381 0 eric 2009-11-20 11:33:38 -0800 commit-queue made a non-sensical rejection during git svn dcommit https://bugs.webkit.org/show_bug.cgi?id=31180#c5 This bug is to remind me to investigate why and fix it if necessary. 166298 1 eric 2009-11-24 15:26:53 -0800 We saw a similar rejection just now: https://bugs.webkit.org/show_bug.cgi?id=31689#c20 166306 2 eric 2009-11-24 15:49:18 -0800 Now that I understand what's going wrong this should be simple to fix! :) 166308 3 eric 2009-11-24 15:51:58 -0800 the git svn dcommit call just needs to pass the include_stderr flag. Many of the calls probably need to have that enabled. In fact, I would suggest that include_stderr be enabled for all callers of run_command except for the one or two that the patch was trying to fix. 166416 4 43839 zoltan 2009-11-25 06:49:57 -0800 Created attachment 43839 Patch 166464 5 43839 eric 2009-11-25 08:18:14 -0800 Comment on attachment 43839 Patch svn-create-patch is actually the culprit of the stderr in diffs. :) As you can see in this diff you uploaded. 166513 6 43861 zoltan 2009-11-25 11:51:49 -0800 Created attachment 43861 Patch 166514 7 43861 eric 2009-11-25 11:52:49 -0800 Comment on attachment 43861 Patch LGTM. 166515 8 43861 eric 2009-11-25 11:53:24 -0800 Comment on attachment 43861 Patch We could also unit test this, with an scm_unittest.py test. My review still stands, but a unit test would be nice, so that we don't break this again. 166518 9 zoltan 2009-11-25 11:56:35 -0800 You were very fast! I'd wrote this: "You're right! Now it works well. (I don't see the ? xxx dir in the patch. :) )" I will write the unit test at tomorrow morning! Should I file it here or make a new bug for it? 166519 10 eric 2009-11-25 11:58:38 -0800 You're welcome to do either. :) Thanks! 166520 11 zoltan 2009-11-25 12:02:32 -0800 Committed r51391: <http://trac.webkit.org/changeset/51391> 166742 12 zoltan 2009-11-26 08:54:05 -0800 I'll have time only next week for the unit-test. I opened a bug for it: #31916 43839 2009-11-25 06:49:57 -0800 2009-11-25 11:50:56 -0800 Patch bug-31734-20091125154955.patch text/plain 3416 zoltan PyAgICAgICBDaGFuZ2VMb2d0eHQKPyAgICAgICBzdm4tY29tbWl0LjIudG1wCj8gICAgICAgdGNt YWxsb2MucGF0Y2gKPyAgICAgICBzdm4tY29tbWl0LjMudG1wCj8gICAgICAgc3ZuLWNvbW1pdC40 LnRtcAo/ICAgICAgIFdlYktpdC5wcm8udXNlcgo/ICAgICAgIGh6Mi5wYXRjaAo/ICAgICAgIGN1 bGFtdWxhLnBhdGNoCj8gICAgICAgNDVwd01uN2s1UQo/ICAgICAgIHRjLnBhdGNoCj8gICAgICAg eHh4eHgKPyAgICAgICBhbG1hLnBhdGNoCj8gICAgICAgYmFuZGkucGF0Y2gKPyAgICAgICBoei5w YXRjaAo/ICAgICAgIHh4eAo/ICAgICAgIGFsbWEudHh0Cj8gICAgICAgc3ZuLWNvbW1pdC50bXAK PyAgICAgICBhbGdhLnVuaS5kaWZmCj8gICAgICAgeC5wYXRjaAo/ICAgICAgIHJvdy5wYXRjaAo/ ICAgICAgIGFsZ2EuZGlmZgo/ICAgICAgIGdpdGRpZmYydW5pZmllZC5zaAo/ICAgICAgIHN6YXIu cGF0Y2gKPyAgICAgICBKYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cub3JpZwo/ICAgICAgIEphdmFT Y3JpcHRDb3JlL0Zhc3RNYWxsb2MuY3BwCj8gICAgICAgSmF2YVNjcmlwdENvcmUvaml0L0pJVFN0 dWJzLmNwcC5vcmlnCj8gICAgICAgV2ViQ29yZS9kb20vVG9rZW5pemVyLmgub3JpZwo/ICAgICAg IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0UHJpdmF0ZS5oLm9yaWcK SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDUxMzgwKQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMDktMTEtMjUgIFpvbHRhbiBIb3J2YXRoICA8 em9sdGFuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQ2hhbmdlIHJ1bl9jb21tYW5kIHRvIGdpdmUgYmFjayBzdGRlcnIgYnkgZGVm YXVsdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzE3 MzQKKworICAgICAgICBDaGFuZ2UgcnVuX2NvbW1hbmQgdG8gZ2l2ZSBiYWNrIHN0ZGVyciBieSBk ZWZhdWx0LgorICAgICAgICBTZXQgcnVuX2NvbW1hbmRzJ3MgJ3N2biBkaWZmJyBjYWxsaW5nIHRv IGdpdmUgYmFjayBvbmx5IHN0ZG91dC4KKyAgICAgICAgQ2hhbmdlIHRoZSByZWxhdGVkIHVuaXR0 ZXN0IGNhbGwuCisKKyAgICAgICAgKiBTY3JpcHRzL21vZHVsZXMvc2NtLnB5OgorICAgICAgICAq IFNjcmlwdHMvbW9kdWxlcy9zY21fdW5pdHRlc3QucHk6CisKIDIwMDktMTEtMjQgIERtaXRyeSBU aXRvdiAgPGRpbWljaEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBT ZWlkZWwuCkluZGV4OiBXZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvc2NtLnB5Cj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9zY20ucHkJKHJldmlzaW9uIDUxMzgw KQorKysgV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL3NjbS5weQkod29ya2luZyBjb3B5KQpA QCAtMTIzLDcgKzEyMyw3IEBAIGNsYXNzIFNDTToKICAgICAgICAgc2VsZi5kcnlydW4gPSBkcnly dW4KIAogICAgIEBzdGF0aWNtZXRob2QKLSAgICBkZWYgcnVuX2NvbW1hbmQoYXJncywgY3dkPU5v bmUsIGlucHV0PU5vbmUsIGVycm9yX2hhbmRsZXI9ZGVmYXVsdF9lcnJvcl9oYW5kbGVyLCByZXR1 cm5fZXhpdF9jb2RlPUZhbHNlLCByZXR1cm5fc3RkZXJyPUZhbHNlKToKKyAgICBkZWYgcnVuX2Nv bW1hbmQoYXJncywgY3dkPU5vbmUsIGlucHV0PU5vbmUsIGVycm9yX2hhbmRsZXI9ZGVmYXVsdF9l cnJvcl9oYW5kbGVyLCByZXR1cm5fZXhpdF9jb2RlPUZhbHNlLCByZXR1cm5fc3RkZXJyPVRydWUp OgogICAgICAgICBpZiBoYXNhdHRyKGlucHV0LCAncmVhZCcpOiAjIENoZWNrIGlmIHRoZSBpbnB1 dCBpcyBhIGZpbGUuCiAgICAgICAgICAgICBzdGRpbiA9IGlucHV0CiAgICAgICAgICAgICBzdHJp bmdfdG9fY29tbXVuaWNhdGUgPSBOb25lCkBAIC0zMzQsNyArMzM0LDcgQEAgY2xhc3MgU1ZOKFND TSk6CiAgICAgICAgIHJldHVybiBzZWxmLmNhY2hlZF92ZXJzaW9uCiAKICAgICBkZWYgd29ya2lu Z19kaXJlY3RvcnlfaXNfY2xlYW4oc2VsZik6Ci0gICAgICAgIHJldHVybiBzZWxmLnJ1bl9jb21t YW5kKFsnc3ZuJywgJ2RpZmYnXSkgPT0gIiIKKyAgICAgICAgcmV0dXJuIHNlbGYucnVuX2NvbW1h bmQoWydzdm4nLCAnZGlmZiddLCByZXR1cm5fc3RkZXJyPUZhbHNlKSA9PSAiIgogCiAgICAgZGVm IGNsZWFuX3dvcmtpbmdfZGlyZWN0b3J5KHNlbGYpOgogICAgICAgICBzZWxmLnJ1bl9jb21tYW5k KFsnc3ZuJywgJ3JldmVydCcsICctUicsICcuJ10pCkluZGV4OiBXZWJLaXRUb29scy9TY3JpcHRz L21vZHVsZXMvc2NtX3VuaXR0ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL1Njcmlw dHMvbW9kdWxlcy9zY21fdW5pdHRlc3QucHkJKHJldmlzaW9uIDUxMzgwKQorKysgV2ViS2l0VG9v bHMvU2NyaXB0cy9tb2R1bGVzL3NjbV91bml0dGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAtMTU0 LDcgKzE1NCw3IEBAIHN2bjogcmVzb3VyY2Ugb3V0IG9mIGRhdGU7IHRyeSB1cGRhdGluZwogICAg ICAgICBjb21tYW5kX3JldHVybnNfbm9uX3plcm8gPSBbJy9iaW4vc2gnLCAnLS1pbnZhbGlkLW9w dGlvbiddCiAgICAgICAgIHNlbGYuYXNzZXJ0UmFpc2VzKFNjcmlwdEVycm9yLCBTQ00ucnVuX2Nv bW1hbmQsIGNvbW1hbmRfcmV0dXJuc19ub25femVybykKICAgICAgICAgIyBDaGVjayBpZiByZXR1 cm5zIGVycm9yIHRleHQ6Ci0gICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShTQ00ucnVuX2NvbW1hbmQo Y29tbWFuZF9yZXR1cm5zX25vbl96ZXJvLCBlcnJvcl9oYW5kbGVyPWlnbm9yZV9lcnJvciwgcmV0 dXJuX3N0ZGVycj1UcnVlKSkKKyAgICAgICAgc2VsZi5hc3NlcnRUcnVlKFNDTS5ydW5fY29tbWFu ZChjb21tYW5kX3JldHVybnNfbm9uX3plcm8sIGVycm9yX2hhbmRsZXI9aWdub3JlX2Vycm9yKSkK IAogICAgICAgICBzZWxmLmFzc2VydFJhaXNlcyhDaGVja291dE5lZWRzVXBkYXRlLCBjb21taXRf ZXJyb3JfaGFuZGxlciwgU2NyaXB0RXJyb3Iob3V0cHV0PWdpdF9mYWlsdXJlX21lc3NhZ2UpKQog ICAgICAgICBzZWxmLmFzc2VydFJhaXNlcyhDaGVja291dE5lZWRzVXBkYXRlLCBjb21taXRfZXJy b3JfaGFuZGxlciwgU2NyaXB0RXJyb3Iob3V0cHV0PXN2bl9mYWlsdXJlX21lc3NhZ2UpKQo= 43861 2009-11-25 11:51:49 -0800 2009-11-25 11:53:24 -0800 Patch bug-31734-20091125205146.patch text/plain 2818 zoltan SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDUxMzkwKQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMDktMTEtMjUgIFpvbHRhbiBIb3J2YXRoICA8 em9sdGFuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQ2hhbmdlIHJ1bl9jb21tYW5kIHRvIGdpdmUgYmFjayBzdGRlcnIgYnkgZGVm YXVsdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzE3 MzQKKworICAgICAgICBDaGFuZ2UgcnVuX2NvbW1hbmQgdG8gZ2l2ZSBiYWNrIHN0ZGVyciBieSBk ZWZhdWx0LgorICAgICAgICBTZXQgcnVuX2NvbW1hbmRzJ3MgJ3N2bi1jcmVhdGUtcGF0Y2gnIGNh bGxpbmcgdG8gcHV0IG9ubHkgdGhlIHN0ZG91dCBpbnRvIHRoZSBwYXRjaGVzLgorICAgICAgICBD aGFuZ2UgdGhlIHJlbGF0ZWQgdW5pdHRlc3QgY2FsbC4KKworICAgICAgICAqIFNjcmlwdHMvbW9k dWxlcy9zY20ucHk6CisgICAgICAgICogU2NyaXB0cy9tb2R1bGVzL3NjbV91bml0dGVzdC5weToK KwogMjAwOS0xMS0yNSAgRXJpYyBTZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KSW5kZXg6IFdlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxl cy9zY20ucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL3NjbS5w eQkocmV2aXNpb24gNTEzOTApCisrKyBXZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvc2NtLnB5 CSh3b3JraW5nIGNvcHkpCkBAIC0xMjMsNyArMTIzLDcgQEAgY2xhc3MgU0NNOgogICAgICAgICBz ZWxmLmRyeXJ1biA9IGRyeXJ1bgogCiAgICAgQHN0YXRpY21ldGhvZAotICAgIGRlZiBydW5fY29t bWFuZChhcmdzLCBjd2Q9Tm9uZSwgaW5wdXQ9Tm9uZSwgZXJyb3JfaGFuZGxlcj1kZWZhdWx0X2Vy cm9yX2hhbmRsZXIsIHJldHVybl9leGl0X2NvZGU9RmFsc2UsIHJldHVybl9zdGRlcnI9RmFsc2Up OgorICAgIGRlZiBydW5fY29tbWFuZChhcmdzLCBjd2Q9Tm9uZSwgaW5wdXQ9Tm9uZSwgZXJyb3Jf aGFuZGxlcj1kZWZhdWx0X2Vycm9yX2hhbmRsZXIsIHJldHVybl9leGl0X2NvZGU9RmFsc2UsIHJl dHVybl9zdGRlcnI9VHJ1ZSk6CiAgICAgICAgIGlmIGhhc2F0dHIoaW5wdXQsICdyZWFkJyk6ICMg Q2hlY2sgaWYgdGhlIGlucHV0IGlzIGEgZmlsZS4KICAgICAgICAgICAgIHN0ZGluID0gaW5wdXQK ICAgICAgICAgICAgIHN0cmluZ190b19jb21tdW5pY2F0ZSA9IE5vbmUKQEAgLTM2MCw3ICszNjAs NyBAQCBjbGFzcyBTVk4oU0NNKToKICAgICAgICAgcmV0dXJuICJzdm4iCiAKICAgICBkZWYgY3Jl YXRlX3BhdGNoKHNlbGYpOgotICAgICAgICByZXR1cm4gc2VsZi5ydW5fY29tbWFuZChzZWxmLnNj cmlwdF9wYXRoKCJzdm4tY3JlYXRlLXBhdGNoIiksIGN3ZD1zZWxmLmNoZWNrb3V0X3Jvb3QpCisg ICAgICAgIHJldHVybiBzZWxmLnJ1bl9jb21tYW5kKHNlbGYuc2NyaXB0X3BhdGgoInN2bi1jcmVh dGUtcGF0Y2giKSwgY3dkPXNlbGYuY2hlY2tvdXRfcm9vdCwgcmV0dXJuX3N0ZGVycj1GYWxzZSkK IAogICAgIGRlZiBkaWZmX2Zvcl9yZXZpc2lvbihzZWxmLCByZXZpc2lvbik6CiAgICAgICAgIHJl dHVybiBzZWxmLnJ1bl9jb21tYW5kKFsnc3ZuJywgJ2RpZmYnLCAnLWMnLCBzdHIocmV2aXNpb24p XSkKSW5kZXg6IFdlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9zY21fdW5pdHRlc3QucHkKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL3NjbV91bml0dGVzdC5weQko cmV2aXNpb24gNTEzOTApCisrKyBXZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvc2NtX3VuaXR0 ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xNTQsNyArMTU0LDcgQEAgc3ZuOiByZXNvdXJjZSBv dXQgb2YgZGF0ZTsgdHJ5IHVwZGF0aW5nCiAgICAgICAgIGNvbW1hbmRfcmV0dXJuc19ub25femVy byA9IFsnL2Jpbi9zaCcsICctLWludmFsaWQtb3B0aW9uJ10KICAgICAgICAgc2VsZi5hc3NlcnRS YWlzZXMoU2NyaXB0RXJyb3IsIFNDTS5ydW5fY29tbWFuZCwgY29tbWFuZF9yZXR1cm5zX25vbl96 ZXJvKQogICAgICAgICAjIENoZWNrIGlmIHJldHVybnMgZXJyb3IgdGV4dDoKLSAgICAgICAgc2Vs Zi5hc3NlcnRUcnVlKFNDTS5ydW5fY29tbWFuZChjb21tYW5kX3JldHVybnNfbm9uX3plcm8sIGVy cm9yX2hhbmRsZXI9aWdub3JlX2Vycm9yLCByZXR1cm5fc3RkZXJyPVRydWUpKQorICAgICAgICBz ZWxmLmFzc2VydFRydWUoU0NNLnJ1bl9jb21tYW5kKGNvbW1hbmRfcmV0dXJuc19ub25femVybywg ZXJyb3JfaGFuZGxlcj1pZ25vcmVfZXJyb3IpKQogCiAgICAgICAgIHNlbGYuYXNzZXJ0UmFpc2Vz KENoZWNrb3V0TmVlZHNVcGRhdGUsIGNvbW1pdF9lcnJvcl9oYW5kbGVyLCBTY3JpcHRFcnJvcihv dXRwdXQ9Z2l0X2ZhaWx1cmVfbWVzc2FnZSkpCiAgICAgICAgIHNlbGYuYXNzZXJ0UmFpc2VzKENo ZWNrb3V0TmVlZHNVcGRhdGUsIGNvbW1pdF9lcnJvcl9oYW5kbGVyLCBTY3JpcHRFcnJvcihvdXRw dXQ9c3ZuX2ZhaWx1cmVfbWVzc2FnZSkpCg==