Attachment #228951 for bug #131115

View Details Raw Unified Return to Bug 131115

| Differences between



2014-04-09  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.

        * 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-09  Alexey Proskuryakov  <ap@apple.com>

        [WK2] HTTP authentication regression tests fail

Lines 176-182 if (isGit() && @changeLogs == 0) { Tools/Scripts/commit-log-editor_sec1
- Tools/Scripts/commit-log-editor -1 / +1 lines
176	chomp($webkitGenerateCommitMessage = `git config --bool core.webkitGenerateCommitMessage`);	176	chomp($webkitGenerateCommitMessage = `git config --bool core.webkitGenerateCommitMessage`);
177	}	177	}
178	if ($webkitGenerateCommitMessage ne "false") {	178	if ($webkitGenerateCommitMessage ne "false") {
179	open CHANGELOG_ENTRIES, "-\|", "$FindBin::Bin/prepare-ChangeLog --git-index --no-write" or die "prepare-ChangeLog failed: $!.\n";	179	open CHANGELOG_ENTRIES, "-\|", "$FindBin::Bin/prepare-ChangeLog --git-index --no-write --no-style" or die "prepare-ChangeLog failed: $!.\n";
180	while (<CHANGELOG_ENTRIES>) {	180	while (<CHANGELOG_ENTRIES>) {
181	print NEWLOG normalizeLineEndings($_, $endl);	181	print NEWLOG normalizeLineEndings($_, $endl);
182	}	182	}



    my $gitCommit = 0;
    my $gitIndex = "";
    my $gitReviewer = "";
    my $checkWebKitStyle = 1;
    my $openChangeLogs = 0;
    my $writeChangeLogs = 1;
    my $showHelp = 0;

                   "git-index" => \$gitIndex,
                   "git-reviewer:s" => \$gitReviewer,
                   "help|h!" => \$showHelp,
                   "style!" => \$checkWebKitStyle,
                   "open|o!" => \$openChangeLogs,
                   "write!" => \$writeChangeLogs,
                   "update!" => \$updateChangeLogs);

        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";

        printDiff($changedFiles, $gitCommit, $gitIndex, $mergeBase);
    }

    if ($checkWebKitStyle) {
        print STDERR "  Running check-webkit-style.\n  ";
        system "$FindBin::Bin/check-webkit-style";
    }  

    # Open ChangeLogs.
    if ($openChangeLogs && @$changeLogs) {
        openChangeLogs($changeLogs);


    my $command;
    if (isSVN()) {
        $command = "'$FindBin::Bin/svn-create-patch --no-style' $changedFilesString";
    } elsif (isGit()) {
        $command = GIT . " diff -M -C " . diffFromToString($gitCommit, $gitIndex, $mergeBase);
        $command .= " -- $changedFilesString" unless $gitCommit;



$ENV{'LC_ALL'} = 'C';

my $showHelp;
my $checkWebKitStyle = 1;
my $ignoreChangelogs = 0;
my $devNull = File::Spec->devnull();

my $result = GetOptions(
    "help"       => \$showHelp,
    "ignore-changelogs" => \$ignoreChangelogs,
    "style!" => \$checkWebKitStyle,
);
if (!$result || $showHelp) {
    print STDERR basename($0) . " [-h|--help] [--ignore-changelogs] [--[no-]style] [svndir1 [svndir2 ...]]\n";
    exit 1;
}


    generateDiff($path, $prefix);
}

if ($checkWebKitStyle) {
    print STDERR "  Finished svn-create-patch. Running check-webkit-style.\n  ";
    system "$FindBin::Bin/check-webkit-style";
}

exit 0;

# Overall sort, considering multiple criteria.

Lines 109-114 _webkit-patch_complete() Tools/Scripts/webkit-tools-completion.sh_sec1
- Tools/Scripts/webkit-tools-completion.sh -1 / +1 lines
109		109
110	complete -F _webkit-patch_complete webkit-patch	110	complete -F _webkit-patch_complete webkit-patch
111	complete -o default -W "--continue --fix-merged --help --no-continue --no-warnings --warnings -c -f -h -w" resolve-ChangeLogs	111	complete -o default -W "--continue --fix-merged --help --no-continue --no-warnings --warnings -c -f -h -w" resolve-ChangeLogs
112	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	112	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
113	complete -W "--clean --debug --help -h" build-webkit	113	complete -W "--clean --debug --help -h" build-webkit
114	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	114	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

Lines 273-279 class SVN(SCM, SVNRepository): Tools/Scripts/webkitpy/common/checkout/scm/svn.py_sec1
- Tools/Scripts/webkitpy/common/checkout/scm/svn.py -1 / +1 lines
273	elif changed_files == None:	273	elif changed_files == None:
274	changed_files = []	274	changed_files = []
275	script_path = self._filesystem.join(self.checkout_root, "Tools", "Scripts", "svn-create-patch")	275	script_path = self._filesystem.join(self.checkout_root, "Tools", "Scripts", "svn-create-patch")
276	return self.run([script_path] + changed_files,	276	return self.run([script_path, "--no-style"] + changed_files,
277	cwd=self.checkout_root, return_stderr=False,	277	cwd=self.checkout_root, return_stderr=False,
278	decode_output=False)	278	decode_output=False)
279		279

Return to Bug 131115

Lines 128-133 sub main() Tools/Scripts/prepare-ChangeLog_sec1
- Tools/Scripts/prepare-ChangeLog -1 / +9 lines
128	my $gitCommit = 0;	128	my $gitCommit = 0;
129	my $gitIndex = "";	129	my $gitIndex = "";
130	my $gitReviewer = "";	130	my $gitReviewer = "";
		131	my $checkWebKitStyle = 1;
131	my $openChangeLogs = 0;	132	my $openChangeLogs = 0;
132	my $writeChangeLogs = 1;	133	my $writeChangeLogs = 1;
133	my $showHelp = 0;	134	my $showHelp = 0;
Lines 144-149 sub main() Tools/Scripts/prepare-ChangeLog_sec2
144	"git-index" => \$gitIndex,	145	"git-index" => \$gitIndex,
145	"git-reviewer:s" => \$gitReviewer,	146	"git-reviewer:s" => \$gitReviewer,
146	"help\|h!" => \$showHelp,	147	"help\|h!" => \$showHelp,
		148	"style!" => \$checkWebKitStyle,
147	"open\|o!" => \$openChangeLogs,	149	"open\|o!" => \$openChangeLogs,
148	"write!" => \$writeChangeLogs,	150	"write!" => \$writeChangeLogs,
149	"update!" => \$updateChangeLogs);	151	"update!" => \$updateChangeLogs);
Lines 158-163 sub main() Tools/Scripts/prepare-ChangeLog_sec3
158	print STDERR " --git-reviewer When populating the ChangeLogs from a git commit claim that the spcified name reviewed the change.\n";	160	print STDERR " --git-reviewer When populating the ChangeLogs from a git commit claim that the spcified name reviewed the change.\n";
159	print STDERR " This option is useful when the git commit lacks a Signed-Off-By: line\n";	161	print STDERR " This option is useful when the git commit lacks a Signed-Off-By: line\n";
160	print STDERR " -h\|--help Show this help message\n";	162	print STDERR " -h\|--help Show this help message\n";
		163	print STDERR " --[no-]style Run check-webkit-style script when done (default: style)\n";
161	print STDERR " -o\|--open Open ChangeLogs in an editor when done\n";	164	print STDERR " -o\|--open Open ChangeLogs in an editor when done\n";
162	print STDERR " --[no-]update Update ChangeLogs from svn before adding entry (default: update)\n";	165	print STDERR " --[no-]update Update ChangeLogs from svn before adding entry (default: update)\n";
163	print STDERR " --[no-]write Write ChangeLogs to disk (otherwise send new entries to stdout) (default: write)\n";	166	print STDERR " --[no-]write Write ChangeLogs to disk (otherwise send new entries to stdout) (default: write)\n";
Lines 225-230 sub main() Tools/Scripts/prepare-ChangeLog_sec4
225	printDiff($changedFiles, $gitCommit, $gitIndex, $mergeBase);	228	printDiff($changedFiles, $gitCommit, $gitIndex, $mergeBase);
226	}	229	}
227		230
		231	if ($checkWebKitStyle) {
		232	print STDERR " Running check-webkit-style.\n ";
		233	system "$FindBin::Bin/check-webkit-style";
		234	}
		235
228	# Open ChangeLogs.	236	# Open ChangeLogs.
229	if ($openChangeLogs && @$changeLogs) {	237	if ($openChangeLogs && @$changeLogs) {
230	openChangeLogs($changeLogs);	238	openChangeLogs($changeLogs);
Lines 1657-1663 sub createPatchCommand($$$$) Tools/Scripts/prepare-ChangeLog_sec5
1657		1665
1658	my $command;	1666	my $command;
1659	if (isSVN()) {	1667	if (isSVN()) {
1660	$command = "'$FindBin::Bin/svn-create-patch' $changedFilesString";	1668	$command = "'$FindBin::Bin/svn-create-patch --no-style' $changedFilesString";
1661	} elsif (isGit()) {	1669	} elsif (isGit()) {
1662	$command = GIT . " diff -M -C " . diffFromToString($gitCommit, $gitIndex, $mergeBase);	1670	$command = GIT . " diff -M -C " . diffFromToString($gitCommit, $gitIndex, $mergeBase);
1663	$command .= " -- $changedFilesString" unless $gitCommit;	1671	$command .= " -- $changedFilesString" unless $gitCommit;

Lines 1-3 Tools/ChangeLog_sec1
- Tools/ChangeLog +18 lines
		1	2014-04-09 James Craig <jcraig@apple.com>
		2
		3	prepare-Changelog and svn-create-patch should optionally run check-webkit-style.
		4	https://bugs.webkit.org/show_bug.cgi?id=131115
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	Added [--[no-]style] param to run check-webkit-style as part of prepare-Changelog and svn-create-patch.
		9
		10	* Scripts/commit-log-editor: Added --no-style.
		11	* Scripts/prepare-ChangeLog: Primary patch.
		12	(main): Primary patch.
		13	(createPatchCommand): Added --no-style.
		14	* Scripts/svn-create-patch: Primary patch.
		15	* Scripts/webkit-tools-completion.sh: Added --style and --no-style.
		16	* Scripts/webkitpy/common/checkout/scm/svn.py: Added --no-style.
		17	(SVN.create_patch): Added --no-style.
		18
1	2014-04-09 Alexey Proskuryakov <ap@apple.com>	19	2014-04-09 Alexey Proskuryakov <ap@apple.com>
2		20
3	[WK2] HTTP authentication regression tests fail	21	[WK2] HTTP authentication regression tests fail

Lines 77-91 sub testfilecmp($$); Tools/Scripts/svn-create-patch_sec1
- Tools/Scripts/svn-create-patch -2 / +9 lines
77	$ENV{'LC_ALL'} = 'C';	77	$ENV{'LC_ALL'} = 'C';
78		78
79	my $showHelp;	79	my $showHelp;
		80	my $checkWebKitStyle = 1;
80	my $ignoreChangelogs = 0;	81	my $ignoreChangelogs = 0;
81	my $devNull = File::Spec->devnull();	82	my $devNull = File::Spec->devnull();
82		83
83	my $result = GetOptions(	84	my $result = GetOptions(
84	"help" => \$showHelp,	85	"help" => \$showHelp,
85	"ignore-changelogs" => \$ignoreChangelogs	86	"ignore-changelogs" => \$ignoreChangelogs,
		87	"style!" => \$checkWebKitStyle,
86	);	88	);
87	if (!$result \|\| $showHelp) {	89	if (!$result \|\| $showHelp) {
88	print STDERR basename($0) . " [-h\|--help] [--ignore-changelogs] [svndir1 [svndir2 ...]]\n";	90	print STDERR basename($0) . " [-h\|--help] [--ignore-changelogs] [--[no-]style] [svndir1 [svndir2 ...]]\n";
89	exit 1;	91	exit 1;
90	}	92	}
91		93
Lines 106-111 for my $path (sort patchpathcmp values % Tools/Scripts/svn-create-patch_sec2
106	generateDiff($path, $prefix);	108	generateDiff($path, $prefix);
107	}	109	}
108		110
		111	if ($checkWebKitStyle) {
		112	print STDERR " Finished svn-create-patch. Running check-webkit-style.\n ";
		113	system "$FindBin::Bin/check-webkit-style";
		114	}
		115
109	exit 0;	116	exit 0;
110		117
111	# Overall sort, considering multiple criteria.	118	# Overall sort, considering multiple criteria.