Commit 8d9fdee4 authored by ddkilzer@apple.com's avatar ddkilzer@apple.com
Browse files

Revert "<http://webkit.org/b/41788> commit-log-editor: wrong ChangeLog read...

Revert "<http://webkit.org/b/41788> commit-log-editor: wrong ChangeLog read when invoked from subdir with git"

This reverts commit r62692.

* Scripts/commit-log-editor:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@62990 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 6b09fffd
2010-07-09 David Kilzer <ddkilzer@apple.com>
Revert "<http://webkit.org/b/41788> commit-log-editor: wrong ChangeLog read when invoked from subdir with git"
This reverts commit r62692.
* Scripts/commit-log-editor:
2010-07-08 Kinuko Yasuda <kinuko@chromium.org>
Reviewed by Ojan Vafai.
......
......@@ -106,7 +106,7 @@ while (<LOG>) {
}
$existingLog = isGit() && !(/^#/ || /^\s*$/) unless $existingLog;
push @changeLogs, $1 if $inChangesToBeCommitted && (/^(?:M|A)....(.*ChangeLog)\r?\n?$/ || /^#\t(?:modified|new file): (.*ChangeLog)$/) && !/-ChangeLog$/;
push @changeLogs, makeFilePathRelative($1) if $inChangesToBeCommitted && (/^(?:M|A)....(.*ChangeLog)\r?\n?$/ || /^#\t(?:modified|new file): (.*ChangeLog)$/) && !/-ChangeLog$/;
}
close LOG;
......@@ -133,8 +133,6 @@ my $topLevel = determineVCSRoot();
my %changeLogSort;
my %changeLogContents;
for my $changeLog (@changeLogs) {
$changeLog = File::Spec->abs2rel(canonicalizePath(File::Spec->rel2abs($changeLog, $ENV{PWD})), $topLevel);
open CHANGELOG, $changeLog or die "Can't open $changeLog";
my $contents = "";
my $blankLines = "";
......@@ -201,6 +199,8 @@ for my $changeLog (@changeLogs) {
}
close CHANGELOG;
$changeLog = File::Spec->abs2rel(File::Spec->rel2abs($changeLog), $topLevel);
my $label = dirname($changeLog);
$label = "top level" unless length $label;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment