Changeset 80795 in webkit

Timestamp:

Mar 10, 2011 4:56:37 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-03-10 Caio Marcelo de Oliveira Filho <​caio.oliveira@openbossa.org>

Reviewed by Adam Roben.

Formatted Diff for attachment 23920 is mangled
​https://bugs.webkit.org/show_bug.cgi?id=21222

The mangled diff files mentioned in the bug were using Mac line
ending and this was causing problems for String#each_line. Now we
normalize the line endings in patch data before processing it.

• PrettyPatch/PrettyPatch.rb:

Location:

trunk/Websites/bugs.webkit.org

Files:

• ChangeLog (modified) (1 diff)
• PrettyPatch/PrettyPatch.rb (modified) (2 diffs)

trunk/Websites/bugs.webkit.org/ChangeLog

@@ +1 @@
+2011-03-10  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
+
+        Reviewed by Adam Roben.
+
+        Formatted Diff for attachment 23920 is mangled
+        https://bugs.webkit.org/show_bug.cgi?id=21222
+
+        The mangled diff files mentioned in the bug were using Mac line
+        ending and this was causing problems for String#each_line. Now we
+        normalize the line endings in patch data before processing it.
+
+        * PrettyPatch/PrettyPatch.rb:
+
 2011-03-10  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
 

trunk/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb

@@ -13 +13 @@
 
     def self.prettify(string)
+        string = normalize_line_ending(string)
         fileDiffs = FileDiff.parse(string)
 
@@ -88 +89 @@
         Websites
     ]
+
+    def self.normalize_line_ending(s)
+        s.gsub /\r\n?/, "\n"
+    end
 
     def self.find_url_and_path(file_path)