Changeset 62990 in webkit

Timestamp:

Jul 9, 2010 1:40:34 PM (14 years ago)

Author:

ddkilzer@apple.com

Message:

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:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/commit-log-editor (modified) (3 diffs)

trunk/WebKitTools/ChangeLog

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

trunk/WebKitTools/Scripts/commit-log-editor

@@ -107 +107 @@
     $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;
@@ -134 +134 @@
 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 = "";
@@ -202 +200 @@
     close CHANGELOG;
 
+    $changeLog = File::Spec->abs2rel(File::Spec->rel2abs($changeLog), $topLevel);
+
     my $label = dirname($changeLog);
     $label = "top level" unless length $label;