Attachment 228562 Details for Bug 131115 – patch

[patch] patch

webkit131115.diff (text/plain), 7.17 KB, created by James Craig on 2014-04-03 17:09:22 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: James Craig

Created: 2014-04-03 17:09:22 PDT

Size: 7.17 KB

patch

obsolete

>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 166755)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,20 @@
>+2014-04-03  James Craig  <jcraig@apple.com>
>+
>+        prepare-Changelog and svn-create-patch should optionally run check-webkit-style.
>+        https://bugs.webkit.org/show_bug.cgi?id=131115
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Added [--[no-]style] param to run check-webkit-style as part of prepare-Changelog and svn-create-patch.
>+        Added as default for prepare-Changelog, but not in svn-create-patch, to avoid loops in recursive calls.
>+
>+        * Scripts/commit-log-editor:
>+        * Scripts/prepare-ChangeLog:
>+        (main):
>+        (checkWebKitStyle):
>+        * Scripts/svn-create-patch:
>+        (checkWebKitStyle):
>+
> 2014-04-03  Santosh Mahto  <santoshbit2007@gmail.com>
> 
>         Unreviewed. Moving my name to commiter section
>Index: Tools/Scripts/commit-log-editor
>===================================================================
>--- Tools/Scripts/commit-log-editor	(revision 166678)
>+++ Tools/Scripts/commit-log-editor	(working copy)
>@@ -176,7 +176,7 @@ if (isGit() && @changeLogs == 0) {
>         chomp($webkitGenerateCommitMessage = `git config --bool core.webkitGenerateCommitMessage`);
>     }
>     if ($webkitGenerateCommitMessage ne "false") {
>-        open CHANGELOG_ENTRIES, "-|", "$FindBin::Bin/prepare-ChangeLog --git-index --no-write" or die "prepare-ChangeLog failed: $!.\n";
>+        open CHANGELOG_ENTRIES, "-|", "$FindBin::Bin/prepare-ChangeLog --git-index --no-write --no-style" or die "prepare-ChangeLog failed: $!.\n";
>         while (<CHANGELOG_ENTRIES>) {
>             print NEWLOG normalizeLineEndings($_, $endl);
>         }
>Index: Tools/Scripts/prepare-ChangeLog
>===================================================================
>--- Tools/Scripts/prepare-ChangeLog	(revision 166678)
>+++ Tools/Scripts/prepare-ChangeLog	(working copy)
>@@ -72,6 +72,7 @@ sub determinePropertyChanges($$$);
> sub diffCommand($$$$);
> sub diffFromToString($$$);
> sub diffHeaderFormat();
>+sub checkWebKitStyle();
> sub extractLineRangeAfterChange($);
> sub extractLineRangeBeforeChange($);
> sub fetchBugDescriptionFromURL($$);
>@@ -128,6 +129,7 @@ sub main()
>     my $gitCommit = 0;
>     my $gitIndex = "";
>     my $gitReviewer = "";
>+    my $checkWebKitStyle = 1;
>     my $openChangeLogs = 0;
>     my $writeChangeLogs = 1;
>     my $showHelp = 0;
>@@ -144,6 +146,7 @@ sub main()
>                    "git-index" => \$gitIndex,
>                    "git-reviewer:s" => \$gitReviewer,
>                    "help|h!" => \$showHelp,
>+                   "style!" => \$checkWebKitStyle,
>                    "open|o!" => \$openChangeLogs,
>                    "write!" => \$writeChangeLogs,
>                    "update!" => \$updateChangeLogs);
>@@ -158,6 +161,7 @@ sub main()
>         print STDERR "  --git-reviewer  When populating the ChangeLogs from a git commit claim that the spcified name reviewed the change.\n";
>         print STDERR "                  This option is useful when the git commit lacks a Signed-Off-By: line\n";
>         print STDERR "  -h|--help       Show this help message\n";
>+        print STDERR "  --[no-]style    Run check-webkit-style script when done (default: style)\n";
>         print STDERR "  -o|--open       Open ChangeLogs in an editor when done\n";
>         print STDERR "  --[no-]update   Update ChangeLogs from svn before adding entry (default: update)\n";
>         print STDERR "  --[no-]write    Write ChangeLogs to disk (otherwise send new entries to stdout) (default: write)\n";
>@@ -225,6 +229,11 @@ sub main()
>         printDiff($changedFiles, $gitCommit, $gitIndex, $mergeBase);
>     }
> 
>+    # Run check-webkit-style.
>+    if ($checkWebKitStyle) {
>+        checkWebKitStyle();
>+    }  
>+
>     # Open ChangeLogs.
>     if ($openChangeLogs && @$changeLogs) {
>         openChangeLogs($changeLogs);
>@@ -588,6 +597,12 @@ sub printDiff($$$$)
>     close DIFF;
> }
> 
>+sub checkWebKitStyle()
>+{
>+    print STDERR "  Running check-webkit-style.\n  ";
>+    system dirname(File::Spec->rel2abs(__FILE__)) . "/check-webkit-style";
>+}
>+
> sub openChangeLogs($)
> {
>     my ($changeLogs) = @_;
>Index: Tools/Scripts/svn-create-patch
>===================================================================
>--- Tools/Scripts/svn-create-patch	(revision 166678)
>+++ Tools/Scripts/svn-create-patch	(working copy)
>@@ -56,6 +56,7 @@ use Time::gmtime;
> use VCSUtils;
> 
> sub binarycmp($$);
>+sub checkWebKitStyle();
> sub diffOptionsForFile($);
> sub findBaseUrl($);
> sub findMimeType($;$);
>@@ -77,15 +78,17 @@ sub testfilecmp($$);
> $ENV{'LC_ALL'} = 'C';
> 
> my $showHelp;
>+my $checkWebKitStyle = 0;
> my $ignoreChangelogs = 0;
> my $devNull = File::Spec->devnull();
> 
> my $result = GetOptions(
>     "help"       => \$showHelp,
>-    "ignore-changelogs"    => \$ignoreChangelogs
>+    "ignore-changelogs"    => \$ignoreChangelogs,
>+    "style!" => \$checkWebKitStyle
> );
> if (!$result || $showHelp) {
>-    print STDERR basename($0) . " [-h|--help] [--ignore-changelogs] [svndir1 [svndir2 ...]]\n";
>+    print STDERR basename($0) . " [-h|--help] [--ignore-changelogs] [--[no-]style] [svndir1 [svndir2 ...]]\n";
>     exit 1;
> }
> 
>@@ -106,6 +109,13 @@ for my $path (sort patchpathcmp values %
>     generateDiff($path, $prefix);
> }
> 
>+# Run check-webkit-style.
>+unless (caller) {
>+    if ($checkWebKitStyle) {
>+        checkWebKitStyle();
>+    }
>+}
>+
> exit 0;
> 
> # Overall sort, considering multiple criteria.
>@@ -132,6 +142,12 @@ sub binarycmp($$)
>     return $fileDataA->{isBinary} <=> $fileDataB->{isBinary};
> }
> 
>+sub checkWebKitStyle()
>+{
>+    print STDERR "  Finished svn-create-patch. Running check-webkit-style.\n  ";
>+    system dirname(File::Spec->rel2abs(__FILE__)) . "/check-webkit-style";
>+}
>+
> sub diffOptionsForFile($)
> {
>     my ($file) = @_;
>Index: Tools/Scripts/webkit-tools-completion.sh
>===================================================================
>--- Tools/Scripts/webkit-tools-completion.sh	(revision 166678)
>+++ Tools/Scripts/webkit-tools-completion.sh	(working copy)
>@@ -109,6 +109,6 @@ _webkit-patch_complete()
> 
> complete -F _webkit-patch_complete webkit-patch
> complete -o default -W "--continue --fix-merged --help --no-continue --no-warnings --warnings -c -f -h -w" resolve-ChangeLogs
>-complete -o default -W "--bug --diff --git-commit --git-index --git-reviewer --help --no-update --no-write --open --update --write -d -h -o" prepare-ChangeLog
>+complete -o default -W "--bug --diff --git-commit --git-index --git-reviewer --help --no-style --no-update --no-write --open --style --update --write -d -h -o" prepare-ChangeLog
> complete -W "--clean --debug --help -h" build-webkit
> complete -o default -W "--add-platform-exceptions --complex-text --configuration --guard-malloc --help --http --ignore-tests --launch-safari --leaks --merge-leak-depth --new-test-results --no-http --no-show-results --no-new-test-results --no-sample-on-timeout --no-strip-editing-callbacks --pixel-tests --platform --port --quiet --random --reset-results --results-directory --reverse --root --sample-on-timeout --singly --skipped --slowest --strict --strip-editing-callbacks --threaded --timeout --tolerance --use-remote-links-to-tests --valgrind --verbose -1 -c -g -h -i -l -m -o -p -q -t -v" run-webkit-tests

Actions: View | Formatted Diff | Diff

Attachments on bug 131115: 228439 | 228562 | 228951 | 230019 | 230027 | 230051