Bug 38319 – svn-apply: Add a "format" property to the hashes returned by parseDiff() and parseDiffHeader()

• Status: RESOLVED
• Resolution: FIXED
• Component: Tools / Tests

[Chris Jerdonek]

The "format" key can initially have values "svn" and "git".

It can be set to "git" from within parseDiffHeader() if the first line matches--

> $line =~ m#^diff --git #

[Chris Jerdonek]

Created attachment 54882 [details]
Proposed patch

[Eric Seidel (no email)]

Comment on attachment 54882 [details]
Proposed patch

OK.

[WebKit Commit Bot]

Comment on attachment 54882 [details]
Proposed patch

Clearing flags on attachment: 54882

Committed r58663: <http://trac.webkit.org/changeset/58663>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[Daniel Bates]

Comment on attachment 54882 [details]
Proposed patch

> diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
> index e76aa08..b09d704 100644
> --- a/WebKitTools/ChangeLog
> +++ b/WebKitTools/ChangeLog
> @@ -1,3 +1,24 @@
> [phone]  Chris Jerdonek  <[e-mail]>
> +
> +        Reviewed by NOBODY (OOPS!).
> +
> +        https://bugs.webkit.org/show_bug.cgi?id=38319
> +
> +        * Scripts/VCSUtils.pm:
> +          - In parseDiffHeader()--
> +            - Added an "scmFormat" hash key to the return value to represent
> +              whether the diff is Git or SVN formatted.
> +            - Adjusted the code so the value of "copiedFromPath" will
> +              be undef rather than "does not exist" if the file was not
> +              copied.
> +
> +        * Scripts/webkitperl/VCSUtils_unittest/parseDiffHeader.pl:
> +          - Added a FIXME to refactor these unit tests to use is_deeply().
> +

You added the FIXME comment to Scripts/webkitperl/VCSUtils_unittest/parseDiff.pl. Not Scripts/webkitperl/VCSUtils_unittest/parseDiffHeader.pl.

[Daniel Bates]

Not a big issue, just thought to point it out.

(In reply to comment #5)
> You added the FIXME comment to
> Scripts/webkitperl/VCSUtils_unittest/parseDiff.pl. Not
> Scripts/webkitperl/VCSUtils_unittest/parseDiffHeader.pl.

[Chris Jerdonek]

Thanks for the review, Eric!

And thanks for pointing out the ChangeLog typo, Daniel.  I fixed it here:

http://trac.webkit.org/changeset/58666