- Revision
- 178686
- Author
- benja...@webkit.org
- Date
- 2015-01-19 18:06:03 -0800 (Mon, 19 Jan 2015)
Log Message
Remove the support for custom suffixes on ChangeLog
https://bugs.webkit.org/show_bug.cgi?id=140648
Patch by Benjamin Poulain <bpoul...@apple.com> on 2015-01-19
Reviewed by David Kilzer.
Custom suffixes were used for the iOS branch of WebKit.
Now that everything is opensource, there is no need for it.
* Scripts/VCSUtils.pm:
(changeLogSuffix): Deleted.
(changeLogFileName): Deleted.
* Scripts/commit-log-editor:
* Scripts/prepare-ChangeLog:
(getLatestChangeLogs):
(generateNewChangeLogs):
(generateFileList):
* Scripts/resolve-ChangeLogs:
(findChangeLog):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (178685 => 178686)
--- trunk/Tools/ChangeLog 2015-01-20 01:35:47 UTC (rev 178685)
+++ trunk/Tools/ChangeLog 2015-01-20 02:06:03 UTC (rev 178686)
@@ -1,3 +1,24 @@
+2015-01-19 Benjamin Poulain <bpoul...@apple.com>
+
+ Remove the support for custom suffixes on ChangeLog
+ https://bugs.webkit.org/show_bug.cgi?id=140648
+
+ Reviewed by David Kilzer.
+
+ Custom suffixes were used for the iOS branch of WebKit.
+ Now that everything is opensource, there is no need for it.
+
+ * Scripts/VCSUtils.pm:
+ (changeLogSuffix): Deleted.
+ (changeLogFileName): Deleted.
+ * Scripts/commit-log-editor:
+ * Scripts/prepare-ChangeLog:
+ (getLatestChangeLogs):
+ (generateNewChangeLogs):
+ (generateFileList):
+ * Scripts/resolve-ChangeLogs:
+ (findChangeLog):
+
2015-01-19 Timothy Horton <timothy_hor...@apple.com>
Adjust naming of action menu SPI
Modified: trunk/Tools/Scripts/VCSUtils.pm (178685 => 178686)
--- trunk/Tools/Scripts/VCSUtils.pm 2015-01-20 01:35:47 UTC (rev 178685)
+++ trunk/Tools/Scripts/VCSUtils.pm 2015-01-20 02:06:03 UTC (rev 178686)
@@ -50,7 +50,6 @@
&callSilently
&canonicalizePath
&changeLogEmailAddress
- &changeLogFileName
&changeLogName
&chdirReturningRelativePath
&decodeGitBinaryChunk
@@ -1897,23 +1896,6 @@
return $result;
}
-sub changeLogSuffix()
-{
- my $rootPath = determineVCSRoot();
- my $changeLogSuffixFile = File::Spec->catfile($rootPath, ".changeLogSuffix");
- return "" if ! -e $changeLogSuffixFile;
- open FILE, $changeLogSuffixFile or die "Could not open $changeLogSuffixFile: $!";
- my $changeLogSuffix = <FILE>;
- chomp $changeLogSuffix;
- close FILE;
- return $changeLogSuffix;
-}
-
-sub changeLogFileName()
-{
- return "ChangeLog" . changeLogSuffix()
-}
-
sub changeLogNameError($)
{
my ($message) = @_;
Modified: trunk/Tools/Scripts/commit-log-editor (178685 => 178686)
--- trunk/Tools/Scripts/commit-log-editor 2015-01-20 01:35:47 UTC (rev 178685)
+++ trunk/Tools/Scripts/commit-log-editor 2015-01-20 02:06:03 UTC (rev 178686)
@@ -148,8 +148,7 @@
# (without the log comment info). We don't need it.
}
$existingLog = isGit() && !($curLine =~ /^#/ || $curLine =~ /^\s*$/) unless $existingLog;
- my $changeLogFileName = changeLogFileName();
- push @changeLogs, makeFilePathRelative($1) if $inChangesToBeCommitted && ($curLine =~ /^(?:M|A)....(.*$changeLogFileName)\r?\n?$/ || $curLine =~ /^#\t(?:modified|new file): (.*$changeLogFileName)$/) && $curLine !~ /-$changeLogFileName$/;
+ push @changeLogs, makeFilePathRelative($1) if $inChangesToBeCommitted && ($curLine =~ /^(?:M|A)....(.*ChangeLog)\r?\n?$/ || $curLine =~ /^#\t(?:modified|new file): (.*ChangeLog)$/) && $curLine !~ /-ChangeLog$/;
}
close LOG;
Modified: trunk/Tools/Scripts/prepare-ChangeLog (178685 => 178686)
--- trunk/Tools/Scripts/prepare-ChangeLog 2015-01-20 01:35:47 UTC (rev 178685)
+++ trunk/Tools/Scripts/prepare-ChangeLog 2015-01-20 02:06:03 UTC (rev 178686)
@@ -496,7 +496,7 @@
my @changeLogs = ();
foreach my $prefix (@$prefixes) {
- push @changeLogs, File::Spec->catfile($prefix || ".", changeLogFileName());
+ push @changeLogs, File::Spec->catfile($prefix || ".", "ChangeLog");
}
return \@changeLogs;
}
@@ -535,7 +535,7 @@
my @old_change_log;
if ($writeChangeLogs) {
- my $changeLogPath = File::Spec->catfile($prefix || ".", changeLogFileName());
+ my $changeLogPath = File::Spec->catfile($prefix || ".", "ChangeLog");
print STDERR " Editing the ${changeLogPath} file.\n";
open OLD_CHANGE_LOG, ${changeLogPath} or die "Could not open ${changeLogPath} file: $!.\n";
# It's less efficient to read the whole thing into memory than it would be
@@ -1854,11 +1854,11 @@
&& !scalar(grep(/^resources$/i, @components))
&& !scalar(grep(/^script-tests$/i, @components));
}
- push @changedFiles, $file if $components[$#components] ne changeLogFileName();
+ push @changedFiles, $file if $components[$#components] ne "ChangeLog";
} elsif (isConflictStatus($status, $gitCommit, $gitIndex) || isConflictStatus($propertyStatus, $gitCommit, $gitIndex)) {
push @conflictFiles, $file;
}
- if (basename($file) ne changeLogFileName()) {
+ if (basename($file) ne "ChangeLog") {
my $description = statusDescription($status, $propertyStatus, $original, $propertyChanges);
$functionLists{$file} = $description if defined $description;
}
Modified: trunk/Tools/Scripts/resolve-ChangeLogs (178685 => 178686)
--- trunk/Tools/Scripts/resolve-ChangeLogs 2015-01-20 01:35:47 UTC (rev 178685)
+++ trunk/Tools/Scripts/resolve-ChangeLogs 2015-01-20 02:06:03 UTC (rev 178686)
@@ -248,10 +248,9 @@
sub findChangeLog($)
{
- my $changeLogFileName = changeLogFileName();
- return $_[0] if basename($_[0]) eq $changeLogFileName;
+ return $_[0] if basename($_[0]) eq "ChangeLog";
- my $file = File::Spec->catfile($_[0], $changeLogFileName);
+ my $file = File::Spec->catfile($_[0], "ChangeLog");
return $file if -d $_[0] and -e $file;
return undef;
