Bug 32820 – check-webkit-style fails if Git is configured with diff.mnemonicprefix

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

[Tor Arne Vestbø]

The regex in WebKitTools/Scripts/modules/diff_parser.py expects a/filname b/filname format

[Tor Arne Vestbø]

Created attachment 45320 [details]
check-webkit-style: Add support for Git's "diff.mnemonicprefix" config option

[Tor Arne Vestbø]

Created attachment 45321 [details]
check-webkit-style: Add support for Git's "diff.mnemonicprefix" config option

[WebKit Review Bot]

style-queue ran check-webkit-style on attachment 45321 [details] without any errors.

[Eric Seidel (no email)]

Comment on attachment 45321 [details]
check-webkit-style: Add support for Git's "diff.mnemonicprefix" config option

I expect other tools, like svn-apply (seen VCSTools.pm) will have trouble with this git setting as well.

This change is in our python code and requires a unit test.

[Tor Arne Vestbø]

Created attachment 45783 [details]
Add support for Git's "diff.mnemonicprefix" config option to WebKitTools

[Eric Seidel (no email)]

VCSTools also has unit tests now, seems we should add a unit test for the perl code as well.

[Tor Arne Vestbø]

Created attachment 45785 [details]
Add support for Git's "diff.mnemonicprefix" config option to WebKitTools

[Chris Jerdonek]

(In reply to comment #6)
> VCSTools also has unit tests now, seems we should add a unit test for the perl
> code as well.

That sounds like a good idea.  I would wait until the following patch lands, though, so the new unit test directory structure can be used for the new test: https://bugs.webkit.org/show_bug.cgi?id=33124

The VCSUtils.pm portion of the test may also assist me in coming up with unit test cases for this:

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

[WebKit Review Bot]

style-queue ran check-webkit-style on attachment 45785 [details] without any errors.

[Tor Arne Vestbø]

Created attachment 45792 [details]
Add support for Git's "diff.mnemonicprefix" config option to WebKitTools

[Tor Arne Vestbø]

Added unit-test for VCUtils' gitdiff2svndiff

I'll update the patch when 33124 gets landed if this one hasn't landed yet.

[WebKit Review Bot]

style-queue ran check-webkit-style on attachment 45792 [details] without any errors.

[Tor Arne Vestbø]

Created attachment 45794 [details]
Updated ChangeLog to reflect new path for python files

[WebKit Review Bot]

style-queue ran check-webkit-style on attachment 45794 [details] without any errors.

[Tor Arne Vestbø]

Created attachment 45800 [details]
Move perl-unit-test to new webkitperl subdir per r52733

[WebKit Review Bot]

style-queue ran check-webkit-style on attachment 45800 [details] without any errors.

[David Kilzer (:ddkilzer)]

Comment on attachment 45800 [details]
Move perl-unit-test to new webkitperl subdir per r52733

> diff --git a/WebKitTools/Scripts/test-webkitperl b/WebKitTools/Scripts/test-webkitperl
> @@ -44,6 +44,7 @@ my @files = (
>      "fixChangeLogPatch.pl",
>      "generatePatchCommand.pl",
>      "runPatchCommand.pl",
> +    "gitdiff2svndiff.pl",
>  );

Nit:  I would prefer these in alphabetic order.

r=me

[Tor Arne Vestbø]

Landed in r52739, with nit fixed :)

Thanks David!