Changeset 53796 in webkit

Timestamp:

Jan 25, 2010 3:18:01 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-01-25 Chris Jerdonek <Chris Jerdonek>

Reviewed by Adam Barth.

Improved prepare-ChangeLog so that it preserves the relative
indentation of a git commit message.

​https://bugs.webkit.org/show_bug.cgi?id=34058

• Scripts/prepare-ChangeLog:
  • Also adjusted the script so that it does not add white space characters to empty lines.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/prepare-ChangeLog (modified) (2 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-01-25  Chris Jerdonek  <cjerdonek@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        Improved prepare-ChangeLog so that it preserves the relative
+        indentation of a git commit message.
+
+        https://bugs.webkit.org/show_bug.cgi?id=34058
+
+        * Scripts/prepare-ChangeLog:
+          - Also adjusted the script so that it does not add white
+            space characters to empty lines.
+
 2010-01-24  Eric Seidel  <eric@webkit.org>
 

trunk/WebKitTools/Scripts/prepare-ChangeLog

@@ -1607 +1607 @@
         $commitLogCount++;
         my $inHeader = 1;
+        my $commitLogIndent; 
         my @lines = split(/\n/, $commitLog);
         shift @lines; # Remove initial blank line
@@ -1621 +1622 @@
                     $reviewer .= ", " . $1;
                 }
-            } elsif (length $line == 0) {
+            } elsif ($line =~ /^\s*$/) {
                 $description = $description . "\n";
             } else {
-                $line =~ s/^\s*//;
-                $description = $description . "        " . $line . "\n";
+                if (!defined($commitLogIndent)) {
+                    # Let the first line with non-white space determine
+                    # the global indent.
+                    $line =~ /^(\s*)\S/;
+                    $commitLogIndent = length($1);
+                }
+                # Strip at most the indent to preserve relative indents.
+                $line =~ s/^\s{0,$commitLogIndent}//;
+                $description = $description . (" " x 8) . $line . "\n";
             }
         }