29211 2009-09-11 15:27:53 -0700 bugzilla-tool rollout threw exception under svn 2009-09-11 16:44:24 -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 bweinstein levin oldest_to_newest 146769 0 eric 2009-09-11 15:27:53 -0700 bugzilla-tool rollout threw exception under svn Worked fine under Git. WebKitTools/Scripts/bugzilla-tool rollout 48229 [~/Projects/WebKitSVN] Traceback (most recent call last): File "WebKitTools/Scripts/bugzilla-tool", line 928, in <module> main() File "WebKitTools/Scripts/bugzilla-tool", line 925, in main return tool.main() File "WebKitTools/Scripts/bugzilla-tool", line 920, in main return command_object.execute(command_options, command_args, self) File "WebKitTools/Scripts/bugzilla-tool", line 572, in execute bug_id = self._parse_bug_id_from_revision_diff(tool, revision) File "WebKitTools/Scripts/bugzilla-tool", line 558, in _parse_bug_id_from_revision_diff return parse_bug_id(original_diff) File "WebKitTools/Scripts/bugzilla-tool", line 63, in parse_bug_id match = re.search("http\://webkit\.org/b/(?P<bug_id>\d+)", message) File "/System/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/re.py", line 134, in search return _compile(pattern, flags).search(string) TypeError: expected string or buffer 146775 1 39485 eric 2009-09-11 15:54:31 -0700 Created attachment 39485 Patch v1 146776 2 bweinstein 2009-09-11 15:56:36 -0700 That was the error I saw on SVN, the "expected string or buffer". 146777 3 39486 eric 2009-09-11 15:58:47 -0700 Created attachment 39486 Slightly better testing 146779 4 eric 2009-09-11 16:00:31 -0700 Adding folks who normally review bugzilla-tool changes, in case they're interested in this one. :) 146781 5 eric 2009-09-11 16:05:24 -0700 Now I'm just seeing bugzilla-tool rollout hang in svn: File "/Users/eseidel/Projects/WebKit/WebKitTools/Scripts/bugzilla-tool", line 928, in <module> svn: Caught signal main() File "/Users/eseidel/Projects/WebKit/WebKitTools/Scripts/bugzilla-tool", line 925, in main return tool.main() File "/Users/eseidel/Projects/WebKit/WebKitTools/Scripts/bugzilla-tool", line 920, in main return command_object.execute(command_options, command_args, self) File "/Users/eseidel/Projects/WebKit/WebKitTools/Scripts/bugzilla-tool", line 581, in execute tool.scm().apply_reverse_diff(revision) File "/Users/eseidel/Projects/WebKit/WebKitTools/Scripts/modules/scm.py", line 328, in apply_reverse_diff self.run_command(['svn', 'merge', '--non-interactive', '-c', '-%s' % revision, self._repository_url()]) File "/Users/eseidel/Projects/WebKit/WebKitTools/Scripts/modules/scm.py", line 94, in run_command output = process.communicate(input)[0].rstrip() File "/System/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/subprocess.py", line 661, in communicate stdout = self.stdout.read() KeyboardInterrupt This will still need a bit of investigation. 146784 6 eric 2009-09-11 16:22:24 -0700 Nope. Turns out that: svn merge -c -48229 http://svn.webkit.org/repository/webkit/trunk just takes about 10 minutes in SVN. I guess I'll add a warning. 146787 7 eric 2009-09-11 16:28:21 -0700 Committed r48320: <http://trac.webkit.org/changeset/48320> 146788 8 eric 2009-09-11 16:29:17 -0700 I added a warning about svn merge taking forever (maybe I'm running the command wrong?) and landed. 146789 9 bweinstein 2009-09-11 16:31:06 -0700 The flag --ignore-ancestry might help. 146792 10 eric 2009-09-11 16:38:09 -0700 svn merge -c -48229 http://svn.webkit.org/repository/webkit/trunk --ignore-ancestry doesn't seem to be any faster, it's been running for 3 minutes already... Anyway, bugzilla-tool rollout makes it very clear what it's doing now. Hopefully if SVN users are using 'rollout' they'll notice and maybe divine some magic to fix it. % bugzilla-tool rollout 48229 Cleaning working directory WARNING: svn merge has been known to take more than 10 minutes to complete. It is recommended you use git for rollouts. Running 'svn merge --non-interactive -c -48229 http://svn.webkit.org/repository/webkit/trunk' 146802 11 abarth 2009-09-11 16:44:24 -0700 (In reply to comment #9) > The flag --ignore-ancestry might help. I recommend this flag. The ancestry system can cause svn merge to run amok. 39485 2009-09-11 15:54:31 -0700 2009-09-11 15:58:41 -0700 Patch v1 bug-29211-20090911155429.patch text/plain 2574 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAyYTljNTE5Li5jZDZjNDNkIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDktMDkt MTEgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGJ1Z3ppbGxhLXRvb2wgcm9sbG91dCB0aHJldyBl eGNlcHRpb24gdW5kZXIgc3ZuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yOTIxMQorCisgICAgICAgICogU2NyaXB0cy9tb2R1bGVzL3NjbS5weTogYWRk IG1pc3NpbmcgcmV0dXJuLCBhbmQgY29udmVydCBudW1iZXIgYXJndW1lbnRzIHRvIHN0cmluZ3Mu CisgICAgICAgICogU2NyaXB0cy9tb2R1bGVzL3NjbV91bml0dGVzdC5weTogYWRkIHRlc3Rpbmcg Zm9yIHRoaXMgZml4LgorCiAyMDA5LTA5LTExICBCcmlhbiBXZWluc3RlaW4gIDxid2VpbnN0ZWlu QGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgbXlzZWxmIHRvIHRoZSBjb21taXR0ZXJzIGxpc3Qu CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvc2NtLnB5IGIvV2ViS2l0 VG9vbHMvU2NyaXB0cy9tb2R1bGVzL3NjbS5weQppbmRleCAxODI5MTZkLi45MWI4ODEwIDEwMDY0 NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvc2NtLnB5CisrKyBiL1dlYktpdFRv b2xzL1NjcmlwdHMvbW9kdWxlcy9zY20ucHkKQEAgLTMxOCw3ICszMTgsNyBAQCBjbGFzcyBTVk4o U0NNKToKICAgICAgICAgcmV0dXJuIHNlbGYucnVuX2NvbW1hbmQoc2VsZi5zY3JpcHRfcGF0aCgi c3ZuLWNyZWF0ZS1wYXRjaCIpLCBjd2Q9c2VsZi5jaGVja291dF9yb290KQogCiAgICAgZGVmIGRp ZmZfZm9yX3JldmlzaW9uKHNlbGYsIHJldmlzaW9uKToKLSAgICAgICAgc2VsZi5ydW5fY29tbWFu ZChbJ3N2bicsICdkaWZmJywgJy1jJywgcmV2aXNpb25dKQorICAgICAgICByZXR1cm4gc2VsZi5y dW5fY29tbWFuZChbJ3N2bicsICdkaWZmJywgJy1jJywgc3RyKHJldmlzaW9uKV0pCiAKICAgICBk ZWYgX3JlcG9zaXRvcnlfdXJsKHNlbGYpOgogICAgICAgICByZXR1cm4gc2VsZi52YWx1ZV9mcm9t X3N2bl9pbmZvKHNlbGYuY2hlY2tvdXRfcm9vdCwgJ1VSTCcpCmRpZmYgLS1naXQgYS9XZWJLaXRU b29scy9TY3JpcHRzL21vZHVsZXMvc2NtX3VuaXR0ZXN0LnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0 cy9tb2R1bGVzL3NjbV91bml0dGVzdC5weQppbmRleCAwYWRlOWFlLi4yYzdiYzZmIDEwMDY0NAot LS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvc2NtX3VuaXR0ZXN0LnB5CisrKyBiL1dl YktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9zY21fdW5pdHRlc3QucHkKQEAgLTE1MCw2ICsxNTAs MTMgQEAgY2xhc3MgU0NNVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgIHNlbGYuc2Nt LmFwcGx5X3JldmVyc2VfZGlmZignNCcpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocmVhZF9m cm9tX3BhdGgoJ3Rlc3RfZmlsZScpLCAidGVzdDF0ZXN0MnRlc3QzXG4iKQogCisgICAgZGVmIF9z aGFyZWRfdGVzdF9kaWZmX2Zvcl9yZXZpc2lvbihzZWxmKToKKyAgICAgICAgIyBQYXRjaCBmb3Jt YXRzIGFyZSBzbGlnaHRseSBkaWZmZXJlbnQgYmV0d2VlbiBzdm4gYW5kIGdpdCwgc28ganVzdCBy ZWdleHAgZm9yIHRoaW5ncyB3ZSBrbm93IHNob3VsZCBiZSB0aGVyZS4KKyAgICAgICAgcjNfcGF0 Y2ggPSBzZWxmLnNjbS5kaWZmX2Zvcl9yZXZpc2lvbigzKQorICAgICAgICBzZWxmLmFzc2VydFRy dWUocmUuc2VhcmNoKCd0ZXN0MycsIHIzX3BhdGNoKSkKKyAgICAgICAgc2VsZi5hc3NlcnRGYWxz ZShyZS5zZWFyY2goJ3Rlc3Q0JywgcjNfcGF0Y2gpKQorICAgICAgICBzZWxmLmFzc2VydFRydWUo cmUuc2VhcmNoKCd0ZXN0MicsIHNlbGYuc2NtLmRpZmZfZm9yX3JldmlzaW9uKDMpKSkKKwogCiBj bGFzcyBTVk5UZXN0KFNDTVRlc3QpOgogCkBAIC0yMTIsNiArMjE5LDkgQEAgY2xhc3MgU1ZOVGVz dChTQ01UZXN0KToKICAgICBkZWYgdGVzdF9yZXZlcnNlX2RpZmYoc2VsZik6CiAgICAgICAgIHNl bGYuX3NoYXJlZF90ZXN0X3JldmVyc2VfZGlmZigpCiAKKyAgICBkZWYgdGVzdF9kaWZmX2Zvcl9y ZXZpc2lvbihzZWxmKToKKyAgICAgICAgc2VsZi5fc2hhcmVkX3Rlc3RfZGlmZl9mb3JfcmV2aXNp b24oKQorCiAKIGNsYXNzIEdpdFRlc3QoU0NNVGVzdCk6CiAKQEAgLTMwMCw1ICszMTAsOCBAQCBj bGFzcyBHaXRUZXN0KFNDTVRlc3QpOgogICAgIGRlZiB0ZXN0X3JldmVyc2VfZGlmZihzZWxmKToK ICAgICAgICAgc2VsZi5fc2hhcmVkX3Rlc3RfcmV2ZXJzZV9kaWZmKCkKIAorICAgIGRlZiB0ZXN0 X2RpZmZfZm9yX3JldmlzaW9uKHNlbGYpOgorICAgICAgICBzZWxmLl9zaGFyZWRfdGVzdF9kaWZm X2Zvcl9yZXZpc2lvbigpCisKIGlmIF9fbmFtZV9fID09ICdfX21haW5fXyc6CiAgICAgdW5pdHRl c3QubWFpbigp 39486 2009-09-11 15:58:47 -0700 2009-09-11 16:03:13 -0700 Slightly better testing bug-29211-20090911155845.patch text/plain 2629 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAyYTljNTE5Li5jZDZjNDNkIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDktMDkt MTEgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGJ1Z3ppbGxhLXRvb2wgcm9sbG91dCB0aHJldyBl eGNlcHRpb24gdW5kZXIgc3ZuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yOTIxMQorCisgICAgICAgICogU2NyaXB0cy9tb2R1bGVzL3NjbS5weTogYWRk IG1pc3NpbmcgcmV0dXJuLCBhbmQgY29udmVydCBudW1iZXIgYXJndW1lbnRzIHRvIHN0cmluZ3Mu CisgICAgICAgICogU2NyaXB0cy9tb2R1bGVzL3NjbV91bml0dGVzdC5weTogYWRkIHRlc3Rpbmcg Zm9yIHRoaXMgZml4LgorCiAyMDA5LTA5LTExICBCcmlhbiBXZWluc3RlaW4gIDxid2VpbnN0ZWlu QGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgbXlzZWxmIHRvIHRoZSBjb21taXR0ZXJzIGxpc3Qu CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvc2NtLnB5IGIvV2ViS2l0 VG9vbHMvU2NyaXB0cy9tb2R1bGVzL3NjbS5weQppbmRleCAxODI5MTZkLi45MWI4ODEwIDEwMDY0 NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvc2NtLnB5CisrKyBiL1dlYktpdFRv b2xzL1NjcmlwdHMvbW9kdWxlcy9zY20ucHkKQEAgLTMxOCw3ICszMTgsNyBAQCBjbGFzcyBTVk4o U0NNKToKICAgICAgICAgcmV0dXJuIHNlbGYucnVuX2NvbW1hbmQoc2VsZi5zY3JpcHRfcGF0aCgi c3ZuLWNyZWF0ZS1wYXRjaCIpLCBjd2Q9c2VsZi5jaGVja291dF9yb290KQogCiAgICAgZGVmIGRp ZmZfZm9yX3JldmlzaW9uKHNlbGYsIHJldmlzaW9uKToKLSAgICAgICAgc2VsZi5ydW5fY29tbWFu ZChbJ3N2bicsICdkaWZmJywgJy1jJywgcmV2aXNpb25dKQorICAgICAgICByZXR1cm4gc2VsZi5y dW5fY29tbWFuZChbJ3N2bicsICdkaWZmJywgJy1jJywgc3RyKHJldmlzaW9uKV0pCiAKICAgICBk ZWYgX3JlcG9zaXRvcnlfdXJsKHNlbGYpOgogICAgICAgICByZXR1cm4gc2VsZi52YWx1ZV9mcm9t X3N2bl9pbmZvKHNlbGYuY2hlY2tvdXRfcm9vdCwgJ1VSTCcpCmRpZmYgLS1naXQgYS9XZWJLaXRU b29scy9TY3JpcHRzL21vZHVsZXMvc2NtX3VuaXR0ZXN0LnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0 cy9tb2R1bGVzL3NjbV91bml0dGVzdC5weQppbmRleCAwYWRlOWFlLi4zYWRhNjZhIDEwMDY0NAot LS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvc2NtX3VuaXR0ZXN0LnB5CisrKyBiL1dl YktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9zY21fdW5pdHRlc3QucHkKQEAgLTE1MCw2ICsxNTAs MTQgQEAgY2xhc3MgU0NNVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgIHNlbGYuc2Nt LmFwcGx5X3JldmVyc2VfZGlmZignNCcpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocmVhZF9m cm9tX3BhdGgoJ3Rlc3RfZmlsZScpLCAidGVzdDF0ZXN0MnRlc3QzXG4iKQogCisgICAgZGVmIF9z aGFyZWRfdGVzdF9kaWZmX2Zvcl9yZXZpc2lvbihzZWxmKToKKyAgICAgICAgIyBQYXRjaCBmb3Jt YXRzIGFyZSBzbGlnaHRseSBkaWZmZXJlbnQgYmV0d2VlbiBzdm4gYW5kIGdpdCwgc28ganVzdCBy ZWdleHAgZm9yIHRoaW5ncyB3ZSBrbm93IHNob3VsZCBiZSB0aGVyZS4KKyAgICAgICAgcjNfcGF0 Y2ggPSBzZWxmLnNjbS5kaWZmX2Zvcl9yZXZpc2lvbigzKQorICAgICAgICBzZWxmLmFzc2VydFRy dWUocmUuc2VhcmNoKCd0ZXN0MycsIHIzX3BhdGNoKSkKKyAgICAgICAgc2VsZi5hc3NlcnRGYWxz ZShyZS5zZWFyY2goJ3Rlc3Q0JywgcjNfcGF0Y2gpKQorICAgICAgICBzZWxmLmFzc2VydFRydWUo cmUuc2VhcmNoKCd0ZXN0MicsIHIzX3BhdGNoKSkKKyAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHJl LnNlYXJjaCgndGVzdDInLCBzZWxmLnNjbS5kaWZmX2Zvcl9yZXZpc2lvbigyKSkpCisKIAogY2xh c3MgU1ZOVGVzdChTQ01UZXN0KToKIApAQCAtMjEyLDYgKzIyMCw5IEBAIGNsYXNzIFNWTlRlc3Qo U0NNVGVzdCk6CiAgICAgZGVmIHRlc3RfcmV2ZXJzZV9kaWZmKHNlbGYpOgogICAgICAgICBzZWxm Ll9zaGFyZWRfdGVzdF9yZXZlcnNlX2RpZmYoKQogCisgICAgZGVmIHRlc3RfZGlmZl9mb3JfcmV2 aXNpb24oc2VsZik6CisgICAgICAgIHNlbGYuX3NoYXJlZF90ZXN0X2RpZmZfZm9yX3JldmlzaW9u KCkKKwogCiBjbGFzcyBHaXRUZXN0KFNDTVRlc3QpOgogCkBAIC0zMDAsNSArMzExLDggQEAgY2xh c3MgR2l0VGVzdChTQ01UZXN0KToKICAgICBkZWYgdGVzdF9yZXZlcnNlX2RpZmYoc2VsZik6CiAg ICAgICAgIHNlbGYuX3NoYXJlZF90ZXN0X3JldmVyc2VfZGlmZigpCiAKKyAgICBkZWYgdGVzdF9k aWZmX2Zvcl9yZXZpc2lvbihzZWxmKToKKyAgICAgICAgc2VsZi5fc2hhcmVkX3Rlc3RfZGlmZl9m b3JfcmV2aXNpb24oKQorCiBpZiBfX25hbWVfXyA9PSAnX19tYWluX18nOgogICAgIHVuaXR0ZXN0 Lm1haW4oKQ==