[Webkit-unassigned] [Bug 111066] svn-apply cannot apply patches which is generated by git to files that contain space characters in their path

[bugzilla-daemon at webkit.org]

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





--- Comment #7 from Daniel Bates <dbates at webkit.org>  2013-05-19 23:33:11 PST ---
(From update of attachment 190883)
View in context: https://bugs.webkit.org/attachment.cgi?id=190883&action=review

Please excuse my tardy reply. Work has been very hectic. Regardless, I will work to be more responsive moving forward. Feel free to ping me via either email or IRC to expedite a response.

This patch won't work for git diffs generated using: git diff --no-prefix --find-renames --find-copies. For example, the following diff renames the file named "Primary File" to "Secondary File":

diff --git Primary File Secondary File
similarity index 100%
rename from Primary File
rename to Secondary File

Maybe it's uncommon to rename or copy a file whose path contains a space character?

> Tools/Scripts/VCSUtils.pm:753
> +            $_ = "--- $indexPath\t(revision 0)"; # Convert to SVN format.

We should add a comment above this line that explains that we explicitly emit the suffix "\t(revision 0)" so that both the command patch(1) won't complain when $indexPath contains a space character and to more closely match the SVN diff format.

> Tools/Scripts/VCSUtils.pm:755
> +            $_ = "+++ $indexPath\t(revision 0)"; # Convert to SVN format.

I suggest we emit the suffix "(working copy)" instead of "(revision 0)"  in this line so as match the output of the command svn diff.

Additionally, we should add a comment above this line that explains that we explicitly emit the suffix "\t(working copy)" so that both the command patch(1) won't complain when $indexPath contains a space character and to more closely match the SVN diff format.

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