Changeset 167751 in webkit

Timestamp:

Apr 24, 2014 12:07:06 AM (10 years ago)

Author:

jcraig@apple.com

Message:

prepare-Changelog and svn-create-patch should optionally run check-webkit-style.
​https://bugs.webkit.org/show_bug.cgi?id=131115

Reviewed by Daniel Bates.

Added [--[no-]style] param to run check-webkit-style as part of prepare-Changelog and svn-create-patch.

• Scripts/commit-log-editor: Added --no-style.
• Scripts/prepare-ChangeLog: Primary patch.

(main): Primary patch.
(createPatchCommand): Added --no-style.

• Scripts/svn-create-patch: Primary patch.
• Scripts/webkit-tools-completion.sh: Added --style and --no-style.
• Scripts/webkitpy/common/checkout/scm/svn.py: Added --no-style.

(SVN.create_patch): Added --no-style.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/commit-log-editor (modified) (1 diff)
• Scripts/prepare-ChangeLog (modified) (5 diffs)
• Scripts/svn-create-patch (modified) (3 diffs)
• Scripts/webkit-tools-completion.sh (modified) (1 diff)
• Scripts/webkitpy/common/checkout/scm/svn.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2014-04-23  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 Daniel Bates.
+
+        Added [--[no-]style] param to run check-webkit-style as part of prepare-Changelog and svn-create-patch.
+
+        * Scripts/commit-log-editor: Added --no-style.
+        * Scripts/prepare-ChangeLog: Primary patch.
+        (main): Primary patch.
+        (createPatchCommand): Added --no-style.
+        * Scripts/svn-create-patch: Primary patch.
+        * Scripts/webkit-tools-completion.sh: Added --style and --no-style.
+        * Scripts/webkitpy/common/checkout/scm/svn.py: Added --no-style.
+        (SVN.create_patch): Added --no-style.
+
 2014-04-23  Anders Carlsson  <andersca@apple.com>
 

trunk/Tools/Scripts/commit-log-editor

@@ -177 +177 @@
     }
     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);

trunk/Tools/Scripts/prepare-ChangeLog

@@ -129 +129 @@
     my $gitIndex = "";
     my $gitReviewer = "";
+    my $checkWebKitStyle = 1;
     my $openChangeLogs = 0;
     my $writeChangeLogs = 1;
@@ -145 +146 @@
                    "git-reviewer:s" => \$gitReviewer,
                    "help|h!" => \$showHelp,
+                   "style!" => \$checkWebKitStyle,
                    "open|o!" => \$openChangeLogs,
                    "write!" => \$writeChangeLogs,
@@ -159 +161 @@
         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";
@@ -225 +228 @@
         printDiff($changedFiles, $gitCommit, $gitIndex, $mergeBase);
     }
+
+    if ($checkWebKitStyle) {
+        print STDERR "  Running check-webkit-style.\n  ";
+        system "$FindBin::Bin/check-webkit-style";
+    }  
 
     # Open ChangeLogs.
@@ -1658 +1666 @@
     my $command;
     if (isSVN()) {
-        $command = "'$FindBin::Bin/svn-create-patch' $changedFilesString";
+        $command = "'$FindBin::Bin/svn-create-patch --no-style' $changedFilesString";
     } elsif (isGit()) {
         $command = GIT . " diff -M -C " . diffFromToString($gitCommit, $gitIndex, $mergeBase);

trunk/Tools/Scripts/svn-create-patch

@@ -78 +78 @@
 
 my $showHelp;
+my $checkWebKitStyle = 1;
 my $ignoreChangelogs = 0;
 my $devNull = File::Spec->devnull();
@@ -83 +84 @@
 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;
 }
@@ -105 +107 @@
 for my $path (sort patchpathcmp values %diffFiles) {
     generateDiff($path, $prefix);
+}
+
+if ($checkWebKitStyle) {
+    print STDERR "  Running check-webkit-style.\n  ";
+    system "$FindBin::Bin/check-webkit-style";
 }
 

trunk/Tools/Scripts/webkit-tools-completion.sh

@@ -110 +110 @@
 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

trunk/Tools/Scripts/webkitpy/common/checkout/scm/svn.py

@@ -274 +274 @@
             changed_files = []
         script_path = self._filesystem.join(self.checkout_root, "Tools", "Scripts", "svn-create-patch")
-        return self.run([script_path] + changed_files,
+        return self.run([script_path, "--no-style"] + changed_files,
             cwd=self.checkout_root, return_stderr=False,
             decode_output=False)