<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[178686] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/178686">178686</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2015-01-19 18:06:03 -0800 (Mon, 19 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove the support for custom suffixes on ChangeLog
https://bugs.webkit.org/show_bug.cgi?id=140648
Patch by Benjamin Poulain <bpoulain@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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptsVCSUtilspm">trunk/Tools/Scripts/VCSUtils.pm</a></li>
<li><a href="#trunkToolsScriptscommitlogeditor">trunk/Tools/Scripts/commit-log-editor</a></li>
<li><a href="#trunkToolsScriptsprepareChangeLog">trunk/Tools/Scripts/prepare-ChangeLog</a></li>
<li><a href="#trunkToolsScriptsresolveChangeLogs">trunk/Tools/Scripts/resolve-ChangeLogs</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (178685 => 178686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2015-01-20 01:35:47 UTC (rev 178685)
+++ trunk/Tools/ChangeLog        2015-01-20 02:06:03 UTC (rev 178686)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-01-19 Benjamin Poulain <bpoulain@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):
+
</ins><span class="cx"> 2015-01-19 Timothy Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Adjust naming of action menu SPI
</span></span></pre></div>
<a id="trunkToolsScriptsVCSUtilspm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/VCSUtils.pm (178685 => 178686)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -50,7 +50,6 @@
</span><span class="cx"> &callSilently
</span><span class="cx"> &canonicalizePath
</span><span class="cx"> &changeLogEmailAddress
</span><del>- &changeLogFileName
</del><span class="cx"> &changeLogName
</span><span class="cx"> &chdirReturningRelativePath
</span><span class="cx"> &decodeGitBinaryChunk
</span><span class="lines">@@ -1897,23 +1896,6 @@
</span><span class="cx"> return $result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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()
-}
-
</del><span class="cx"> sub changeLogNameError($)
</span><span class="cx"> {
</span><span class="cx"> my ($message) = @_;
</span></span></pre></div>
<a id="trunkToolsScriptscommitlogeditor"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/commit-log-editor (178685 => 178686)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -148,8 +148,7 @@
</span><span class="cx"> # (without the log comment info). We don't need it.
</span><span class="cx"> }
</span><span class="cx"> $existingLog = isGit() && !($curLine =~ /^#/ || $curLine =~ /^\s*$/) unless $existingLog;
</span><del>- my $changeLogFileName = changeLogFileName();
- push @changeLogs, makeFilePathRelative($1) if $inChangesToBeCommitted && ($curLine =~ /^(?:M|A)....(.*$changeLogFileName)\r?\n?$/ || $curLine =~ /^#\t(?:modified|new file): (.*$changeLogFileName)$/) && $curLine !~ /-$changeLogFileName$/;
</del><ins>+ push @changeLogs, makeFilePathRelative($1) if $inChangesToBeCommitted && ($curLine =~ /^(?:M|A)....(.*ChangeLog)\r?\n?$/ || $curLine =~ /^#\t(?:modified|new file): (.*ChangeLog)$/) && $curLine !~ /-ChangeLog$/;
</ins><span class="cx"> }
</span><span class="cx"> close LOG;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptsprepareChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/prepare-ChangeLog (178685 => 178686)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -496,7 +496,7 @@
</span><span class="cx">
</span><span class="cx"> my @changeLogs = ();
</span><span class="cx"> foreach my $prefix (@$prefixes) {
</span><del>- push @changeLogs, File::Spec->catfile($prefix || ".", changeLogFileName());
</del><ins>+ push @changeLogs, File::Spec->catfile($prefix || ".", "ChangeLog");
</ins><span class="cx"> }
</span><span class="cx"> return \@changeLogs;
</span><span class="cx"> }
</span><span class="lines">@@ -535,7 +535,7 @@
</span><span class="cx"> my @old_change_log;
</span><span class="cx">
</span><span class="cx"> if ($writeChangeLogs) {
</span><del>- my $changeLogPath = File::Spec->catfile($prefix || ".", changeLogFileName());
</del><ins>+ my $changeLogPath = File::Spec->catfile($prefix || ".", "ChangeLog");
</ins><span class="cx"> print STDERR " Editing the ${changeLogPath} file.\n";
</span><span class="cx"> open OLD_CHANGE_LOG, ${changeLogPath} or die "Could not open ${changeLogPath} file: $!.\n";
</span><span class="cx"> # It's less efficient to read the whole thing into memory than it would be
</span><span class="lines">@@ -1854,11 +1854,11 @@
</span><span class="cx"> && !scalar(grep(/^resources$/i, @components))
</span><span class="cx"> && !scalar(grep(/^script-tests$/i, @components));
</span><span class="cx"> }
</span><del>- push @changedFiles, $file if $components[$#components] ne changeLogFileName();
</del><ins>+ push @changedFiles, $file if $components[$#components] ne "ChangeLog";
</ins><span class="cx"> } elsif (isConflictStatus($status, $gitCommit, $gitIndex) || isConflictStatus($propertyStatus, $gitCommit, $gitIndex)) {
</span><span class="cx"> push @conflictFiles, $file;
</span><span class="cx"> }
</span><del>- if (basename($file) ne changeLogFileName()) {
</del><ins>+ if (basename($file) ne "ChangeLog") {
</ins><span class="cx"> my $description = statusDescription($status, $propertyStatus, $original, $propertyChanges);
</span><span class="cx"> $functionLists{$file} = $description if defined $description;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsScriptsresolveChangeLogs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/resolve-ChangeLogs (178685 => 178686)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -248,10 +248,9 @@
</span><span class="cx">
</span><span class="cx"> sub findChangeLog($)
</span><span class="cx"> {
</span><del>- my $changeLogFileName = changeLogFileName();
- return $_[0] if basename($_[0]) eq $changeLogFileName;
</del><ins>+ return $_[0] if basename($_[0]) eq "ChangeLog";
</ins><span class="cx">
</span><del>- my $file = File::Spec->catfile($_[0], $changeLogFileName);
</del><ins>+ my $file = File::Spec->catfile($_[0], "ChangeLog");
</ins><span class="cx"> return $file if -d $_[0] and -e $file;
</span><span class="cx">
</span><span class="cx"> return undef;
</span></span></pre>
</div>
</div>
</body>
</html>