Created attachment 56040 [details] webkit-patch output I ran 'webkit-patch upload NNN' with a new image result added to my git index. In the diff file (attached), I see: Exception raised during decoding git binary patch: /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/open3.rb:67:in `exec': No such file or directory - /opt/local/bin/git apply --directory=/var/folders/4I/4IFxjUcVHIip-GD1W3OsEE+++TM/-Tmp- (Errno::ENOENT) from /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/open3.rb:67:in `popen3' from /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/open3.rb:53:in `fork' from /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/open3.rb:53:in `popen3' from /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/open3.rb:51:in `fork' from /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/open3.rb:51:in `popen3' from /Volumes/InternalData/Development/webkit/OpenSource/BugsSite/PrettyPatch/PrettyPatch.rb:452:in `extract_contents_from_git_binary_chunk' from /Volumes/InternalData/Development/webkit/OpenSource/BugsSite/PrettyPatch/PrettyPatch.rb:373:in `initialize' from /Volumes/InternalData/Development/webkit/OpenSource/BugsSite/PrettyPatch/PrettyPatch.rb:372:in `collect' from /Volumes/InternalData/Development/webkit/OpenSource/BugsSite/PrettyPatch/PrettyPatch.rb:372:in `initialize' from /Volumes/InternalData/Development/webkit/OpenSource/BugsSite/PrettyPatch/PrettyPatch.rb:424:in `new' from /Volumes/InternalData/Development/webkit/OpenSource/BugsSite/PrettyPatch/PrettyPatch.rb:424:in `parse' from /Volumes/InternalData/Development/webkit/OpenSource/BugsSite/PrettyPatch/PrettyPatch.rb:424:in `collect' from /Volumes/InternalData/Development/webkit/OpenSource/BugsSite/PrettyPatch/PrettyPatch.rb:424:in `parse' from /Volumes/InternalData/Development/webkit/OpenSource/BugsSite/PrettyPatch/PrettyPatch.rb:15:in `prettify' from /Volumes/InternalData/Development/webkit/OpenSource/BugsSite/PrettyPatch/prettify.rb:26 /Volumes/InternalData/Development/webkit/OpenSource/BugsSite/PrettyPatch/PrettyPatch.rb:458:in `extract_contents_from_git_binary_chunk' /Volumes/InternalData/Development/webkit/OpenSource/BugsSite/PrettyPatch/PrettyPatch.rb:373:in `initialize' /Volumes/InternalData/Development/webkit/OpenSource/BugsSite/PrettyPatch/PrettyPatch.rb:372:in `collect' /Volumes/InternalData/Development/webkit/OpenSource/BugsSite/PrettyPatch/PrettyPatch.rb:372:in `initialize' /Volumes/InternalData/Development/webkit/OpenSource/BugsSite/PrettyPatch/PrettyPatch.rb:424:in `new' /Volumes/InternalData/Development/webkit/OpenSource/BugsSite/PrettyPatch/PrettyPatch.rb:424:in `parse' /Volumes/InternalData/Development/webkit/OpenSource/BugsSite/PrettyPatch/PrettyPatch.rb:424:in `collect' /Volumes/InternalData/Development/webkit/OpenSource/BugsSite/PrettyPatch/PrettyPatch.rb:424:in `parse' /Volumes/InternalData/Development/webkit/OpenSource/BugsSite/PrettyPatch/PrettyPatch.rb:15:in `prettify' /Volumes/InternalData/Development/webkit/OpenSource/BugsSite/PrettyPatch/prettify.rb:26
On SnowLeopard, WebKit r59396
No such file or directory - /opt/local/bin/git apply My git is in /usr/local/bin/git.
BugsSite/PrettyPatch/PrettyPatch.rb has GIT_PATH = "/opt/local/bin/git" which is bogus.
PrettyPatch is thanks to senior Roben, although others (including myself) have hacked on it. Seems like an easy fix. We should probably use 'which git' if available.
Thank you for the report, btw.
Created attachment 64610 [details] Patch
Comment on attachment 64610 [details] Patch It looks like other scripts also expect git to be in your path (e.g., prepare-ChangeLog, resolve-ChangeLog, VCSUtils.pm).
Attachment 64610 [details] did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 BugsSite/ChangeLog:1: One or more unexpected \r (^M) found; better to use only a \n [whitespace/carriage_return] [1] Suppressing further [whitespace/carriage_return] reports for this file. Total errors found: 9 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style.
prepare-ChangeLog works fine for me on the same machine.
Comment on attachment 64610 [details] Patch OK. Makes sense.
Comment on attachment 64610 [details] Patch Rejecting patch 64610 from commit-queue. Unexpected failure when processing patch! Please file a bug against webkit-patch. Failed to run "['./WebKitTools/Scripts/webkit-patch', '--status-host=queues.webkit.org', 'land-attachment', '--force-clean', '--build', '--non-interactive', '--ignore-builders', '--build-style=both', '--quiet', 64610, '--test', '--parent-command=commit-queue', '--no-update']" exit_code: 1 Last 500 characters of output: webkitpy/tool/commands/stepsequence.py", line 64, in _run step(tool, options).run(state) File "/Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/webkitpy/tool/steps/validatereviewer.py", line 66, in run if self._has_valid_reviewer(changelog_entry): File "/Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/webkitpy/tool/steps/validatereviewer.py", line 48, in _has_valid_reviewer if changelog_entry.reviewer(): AttributeError: 'NoneType' object has no attribute 'reviewer'
Comment on attachment 64610 [details] Patch I'm confused by that commit-queue error. Lets try again. :)
My guess is its failing to parse the changelog. Just not sure why.
Likely because of the \r complained about in https://bugs.webkit.org/show_bug.cgi?id=39097#c8
Comment on attachment 64610 [details] Patch Seems like we should update webkit-patch to detect \r in a ChangeLog and barf nicely. This can't be cq+'d as is. And ideally the \r would be removed from the ChangeLog anyway.
*** Bug 38101 has been marked as a duplicate of this bug. ***
Created attachment 64867 [details] Patch
Comment on attachment 64867 [details] Patch I removed the \r's in ChangeLog (the whole file had \r's) and set the svn:eol-style to native.
Comment on attachment 64867 [details] Patch Okiedokes. Thanks for fixing the ChangeLog.
Comment on attachment 64867 [details] Patch Clearing flags on attachment: 64867 Committed r65686: <http://trac.webkit.org/changeset/65686>
All reviewed patches have been landed. Closing bug.
It turns out that whatever computer runs PrettyPatch.rb when you click "Formatted Diff" on the bots depended on the full git path. For example, the following patch fails even though it includes the git binary information in the diff. https://bugs.webkit.org/attachment.cgi?id=64890&action=prettypatch Where does this run? Can we fix the path to git on the bots?
wms is our man! if he can't do it, no one can!
Dave, looks like we need to adjust the PATH for the open2() in attachment.cgi? http://trac.webkit.org/browser/trunk/BugsSite/attachment.cgi#L395
jparent is also on rather intimate terms with bugzilla...
(In reply to comment #25) > Dave, looks like we need to adjust the PATH for the open2() in attachment.cgi? > > http://trac.webkit.org/browser/trunk/BugsSite/attachment.cgi#L395 Alternately, maybe we can just symlink /usr/bin/git to /opt/local/bin/git on bugs.webkit.org? I could also change PrettyPatch.rb to use /usr/bin/env git.
Bugs' PrettyPatch has been fixed in <http://trac.webkit.org/changeset/66104>.
(In reply to comment #28) > Bugs' PrettyPatch has been fixed in <http://trac.webkit.org/changeset/66104>. Inadvertent changes backed out in r66105. <http://trac.webkit.org/changeset/66105>