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
Created attachment 39485 [details] Patch v1
That was the error I saw on SVN, the "expected string or buffer".
Created attachment 39486 [details] Slightly better testing
Adding folks who normally review bugzilla-tool changes, in case they're interested in this one. :)
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.
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.
Committed r48320: <http://trac.webkit.org/changeset/48320>
I added a warning about svn merge taking forever (maybe I'm running the command wrong?) and landed.
The flag --ignore-ancestry might help.
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'
(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.