[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit d5c0e2693dd409009cdd2402a7e88d90cd378c69
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 25 11:18:01 2010 +0000

    2010-01-25  Chris Jerdonek  <cjerdonek at 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.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53796 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index c49d317..d15eca2 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2010-01-25  Chris Jerdonek  <cjerdonek at 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 at webkit.org>
 
         No review, rolling out r53763.
diff --git a/WebKitTools/Scripts/prepare-ChangeLog b/WebKitTools/Scripts/prepare-ChangeLog
index 4c59af9..57743e7 100755
--- a/WebKitTools/Scripts/prepare-ChangeLog
+++ b/WebKitTools/Scripts/prepare-ChangeLog
@@ -1606,6 +1606,7 @@ sub reviewerAndDescriptionForGitCommit($)
         $description .= "\n" if $commitLogCount;
         $commitLogCount++;
         my $inHeader = 1;
+        my $commitLogIndent; 
         my @lines = split(/\n/, $commitLog);
         shift @lines; # Remove initial blank line
         foreach my $line (@lines) {
@@ -1620,11 +1621,18 @@ sub reviewerAndDescriptionForGitCommit($)
                 } else {
                     $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";
             }
         }
     }

-- 
WebKit Debian packaging