Changeset 76255 in webkit

Timestamp:

Jan 20, 2011 9:11:18 AM (13 years ago)

Author:

Adam Roben

Message:

Convert paths in environment variables back to msys-style inside commit-log-editor

When this script gets run from inside git commit, msys-style paths in the environment will
have been turned into Windows-style paths with forward slashes. This screws up functions
like File::Spec->rel2abs, which seem to rely on $PWD having an msys-style path. We convert
the paths back to msys-style before doing anything else.

Fixes <​http://webkit.org/b/48527> commit-log-editor uses full paths for section headers when
using msysgit's Perl and multiple ChangeLogs have been edited

Reviewed by David Kilzer.

• Scripts/commit-log-editor: Call fixEnvironment before doing anything else.

(fixEnvironment): Added. When run in msys in conjunction with git (i.e., when invoked from
inside git commit), convert Windows-style paths in the environment back to msys-style paths.

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2011-01-19  Adam Roben  <aroben@apple.com>
+
+        Convert paths in environment variables back to msys-style inside commit-log-editor
+
+        When this script gets run from inside git commit, msys-style paths in the environment will
+        have been turned into Windows-style paths with forward slashes. This screws up functions
+        like File::Spec->rel2abs, which seem to rely on $PWD having an msys-style path. We convert
+        the paths back to msys-style before doing anything else.
+
+        Fixes <http://webkit.org/b/48527> commit-log-editor uses full paths for section headers when
+        using msysgit's Perl and multiple ChangeLogs have been edited
+
+        Reviewed by David Kilzer.
+
+        * Scripts/commit-log-editor: Call fixEnvironment before doing anything else.
+        (fixEnvironment): Added. When run in msys in conjunction with git (i.e., when invoked from
+        inside git commit), convert Windows-style paths in the environment back to msys-style paths.
+
 2011-01-20  Zoltan Horvath  <zoltan@webkit.org>
 

trunk/Tools/Scripts/commit-log-editor

@@ -39 +39 @@
 use webkitdirs;
 
+sub fixEnvironment();
 sub normalizeLineEndings($$);
 sub removeLongestCommonPrefixEndingInDoubleNewline(\%);
@@ -59 +60 @@
     usage();
 }
+
+fixEnvironment();
 
 my $baseDir = baseProductDir();
@@ -283 +286 @@
 unlink "$log.edit";
 
+sub fixEnvironment()
+{
+    return unless isMsys() && isGit();
+
+    # When this script gets run from inside git commit, msys-style paths in the
+    # environment will have been turned into Windows-style paths with forward
+    # slashes. This screws up functions like File::Spec->rel2abs, which seem to
+    # rely on $PWD having an msys-style path. We convert the paths back to
+    # msys-style here by transforming "c:/foo" to "/c/foo" (e.g.). See
+    # <http://webkit.org/b/48527>.
+    foreach my $key (keys %ENV) {
+        $ENV{$key} =~ s#^([[:alpha:]]):/#/$1/#;
+    }
+}
+
 sub normalizeLineEndings($$)
 {