Changeset 171856 in webkit

Timestamp:

Jul 31, 2014 9:24:02 AM (10 years ago)

Author:

commit-queue@webkit.org

Message:

[webkitpy] Make diff_text generate correct diff if there is no newline at the end of file
​https://bugs.webkit.org/show_bug.cgi?id=135381

Patch by Tibor Meszaros <​tmeszaros.u-szeged@partner.samsung.com> on 2014-07-31
Reviewed by Csaba Osztrogonác.

• Scripts/webkitpy/port/base.py:

(Port.diff_text):

• Scripts/webkitpy/port/base_unittest.py:

(PortTest.test_diff_text):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/port/base.py (modified) (1 diff)
• Scripts/webkitpy/port/base_unittest.py (modified) (1 diff, 1 prop)

trunk/Tools/ChangeLog

@@ +1 @@
+2014-07-31  Tibor Meszaros  <tmeszaros.u-szeged@partner.samsung.com>
+
+        [webkitpy] Make diff_text generate correct diff if there is no newline at the end of file
+        https://bugs.webkit.org/show_bug.cgi?id=135381
+
+        Reviewed by Csaba Osztrogonác.
+
+        * Scripts/webkitpy/port/base.py:
+        (Port.diff_text):
+        * Scripts/webkitpy/port/base_unittest.py:
+        (PortTest.test_diff_text):
+
 2014-07-31  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Tools/Scripts/webkitpy/port/base.py

@@ -314 +314 @@
                                     expected_filename,
                                     actual_filename)
-        return ''.join(diff)
+        result = ""
+        for line in diff:
+            result += line
+            if not line.endswith('\n'):
+                result += '\n\ No newline at end of file\n'
+        return result
 
     def check_for_leaks(self, process_name, process_pid):

trunk/Tools/Scripts/webkitpy/port/base_unittest.py

@@ -109 +109 @@
             u'a\xac\u1234\u20ac\U00008000', 'act', 'exp.txt', 'act.txt')
 
+        t1 = "A\n\nB"
+        t2 = "A\n\nB\n\n\n"
+        t3 = "--- exp.txt\n+++ act.txt\n@@ -1,3 +1,5 @@\n A\n \n-B\n\ No newline at end of file\n+B\n+\n+\n"
+        self.assertEqual(t3, port.diff_text(t1, t2, 'exp.txt', 'act.txt'))
+
         # And make sure we actually get diff output.
         diff = port.diff_text('foo', 'bar', 'exp.txt', 'act.txt')