[Webkit-unassigned] [Bug 135998] New: webkit-patch shouldn't truncate output from 'git svn dcommit'

bugzilla-daemon at webkit.org bugzilla-daemon at webkit.org
Fri Aug 15 15:38:51 PDT 2014


https://bugs.webkit.org/show_bug.cgi?id=135998

           Summary: webkit-patch shouldn't truncate output from 'git svn
                    dcommit'
           Product: WebKit
           Version: 528+ (Nightly build)
          Platform: Unspecified
        OS/Version: Unspecified
            Status: NEW
          Severity: Normal
          Priority: P2
         Component: Tools / Tests
        AssignedTo: webkit-unassigned at lists.webkit.org
        ReportedBy: burg at cs.washington.edu
                CC: ddkilzer at webkit.org, ossy at webkit.org,
                    joepeck at webkit.org, dfarler at apple.com


It makes it really hard to diagnose failed commits. For example, if you hit the pre-commit hook for having an OOPS in the changelog, the command will die mysteriously, printing something like the following:


---

Last 500 characters of output:
be8dd10 and refs/remotes/origin/master differ, using rebase:
:040000 040000 faf4b32c792fe9d5eaf6c0463471892c6a5991b5 164f425c4fa57f2fbf6f5c42ba43f1d0d47fab08 M    Source
:040000 040000 839cd568d970e1bf83c4036ec5617621f7bb8e20 2607407e1094dbb339dfcb1730f32126fe52af7e M    Tools
Current branch master is up to date.
ERROR: Not all changes have been committed into SVN, however the committed
ones (if any) seem to be successfully integrated into the working tree.
Please see the above messages for details.


webkitpy.tool.bot.queueengine: [ERROR] Failed to run "['git', 'svn', 'dcommit', '--rmdir']" exit_code: 1 cwd: /Users/burg/repos/webkit

---

Whereas the actual error message is quite clear:

ERROR from SVN:
A repository hook failed: Commit blocked by pre-commit hook (exit code 1) with output:
svnlook: Can't write to stream: Broken pipe
svnlook: Can't write to stream: Broken pipe

    The following ChangeLog files contain OOPS:

        trunk/Source/JavaScriptCore/ChangeLog
        trunk/Tools/ChangeLog

    Please don't ever say "OOPS" in a ChangeLog file.
W: 39645e9435e6061663504b5c6d6adf4cfbe8dd10 and refs/remotes/origin/master differ, using rebase:
:040000 040000 faf4b32c792fe9d5eaf6c0463471892c6a5991b5 164f425c4fa57f2fbf6f5c42ba43f1d0d47fab08 M    Source
:040000 040000 839cd568d970e1bf83c4036ec5617621f7bb8e20 2607407e1094dbb339dfcb1730f32126fe52af7e M    Tools
Current branch master is up to date.
ERROR: Not all changes have been committed into SVN, however the committed
ones (if any) seem to be successfully integrated into the working tree.
Please see the above messages for details.

-- 
Configure bugmail: https://bugs.webkit.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.



More information about the webkit-unassigned mailing list