Merge branch 'old-new-path-recogonize'

cdiff.py

                 out.append(line)
         return out
 
+    def is_completed(self):
+        old_completed = self._old_addr[1] == len(self._get_old_text())
+        new_completed = self._new_addr[1] == len(self._get_new_text())
+        return old_completed and new_completed
+
 
 class UnifiedDiff(object):
 
             old_addr = (int(a[0][1:]), int(a[1]))
         else:
             # @@ -1 +1,2 @@
-            old_addr = (int(a[0][1:]), 0)
+            old_addr = (int(a[0][1:]), 1)
 
         b = hunk_meta.split()[2].split(',')   # +3 6
         if len(b) > 1:
             new_addr = (int(b[0][1:]), int(b[1]))
         else:
             # @@ -0,0 +1 @@
-            new_addr = (int(b[0][1:]), 0)
+            new_addr = (int(b[0][1:]), 1)
 
         return (old_addr, new_addr)
 
             line = decode(line)
 
             if diff.is_old_path(line):
-                # FIXME: '--- ' breaks here, better to probe next line
-                if diff._old_path and diff._new_path and diff._hunks:
-                    # See a new diff, yield previous diff if exists
-                    yield diff
-                diff = UnifiedDiff(headers, line, None, [])
-                headers = []
+                # This is a new diff when current hunk is not yet genreated or
+                # is completed.  We yield previous diff if exists and construct
+                # a new one for this case.  Otherwise it's acutally an 'old'
+                # line starts with '--- '.
+                #
+                if (not diff._hunks or diff._hunks[-1].is_completed()):
+                    if diff._old_path and diff._new_path and diff._hunks:
+                        yield diff
+                    diff = UnifiedDiff(headers, line, None, [])
+                    headers = []
+                else:
+                    diff._hunks[-1].append(diff.parse_hunk_line(line))
 
             elif diff.is_new_path(line) and diff._old_path:
-                diff._new_path = line
+                if not diff._new_path:
+                    diff._new_path = line
+                else:
+                    diff._hunks[-1].append(diff.parse_hunk_line(line))
 
             elif diff.is_hunk_meta(line):
                 hunk_meta = line

tests/evil-udiff/in.diff

+--- evil.orig   2013-06-01 16:36:29.676003599 -0500
++++ evil.new    2013-06-01 16:36:28.280056137 -0500
+@@ -1,12 +1,12 @@
+ blah blah blah
+-humbug
++bah humbug
+ one two three
+ four five six
+--- vim73/src/ui.c      2013-06-01 14:48:45.012467754 -0500
++++ vim73/src/ui.c      2013-06-01 14:48:45.012467754 -0500
+ @@ -1,6 +1,6 @@
+ blah blah blah
+ humbug
+ one two three
+ four five six
+-eight nine ten
++seven eight nine ten
+ zero

tests/evil-udiff/out.normal

+--- evil.orig   2013-06-01 16:36:29.676003599 -0500
++++ evil.new    2013-06-01 16:36:28.280056137 -0500
+@@ -1,12 +1,12 @@
+ blah blah blah
+-humbug
++bah humbug
+ one two three
+ four five six
+--- vim73/src/ui.c      2013-06-01 14:48:45.012467754 -0500
++++ vim73/src/ui.c      2013-06-01 14:48:45.012467754 -0500
+ @@ -1,6 +1,6 @@
+ blah blah blah
+ humbug
+ one two three
+ four five six
+-eight nine ten
++seven eight nine ten
+ zero
+

tests/evil-udiff/out.side-by-side

+--- evil.orig   2013-06-01 16:36:29.676003599 -0500
++++ evil.new    2013-06-01 16:36:28.280056137 -0500
+@@ -1,12 +1,12 @@
+ 1 blah blah blah                                                                    1 blah blah blah
+ 2 humbug                                                                            2 bah humbug
+ 3 one two three                                                                     3 one two three
+ 4 four five six                                                                     4 four five six
+ 5 -- vim73/src/ui.c      2013-06-01 14:48:45.012467754 -0500                        5 ++ vim73/src/ui.c      2013-06-01 14:48:45.012467754 -0500
+ 6 @@ -1,6 +1,6 @@                                                                   6 @@ -1,6 +1,6 @@
+ 7 blah blah blah                                                                    7 blah blah blah
+ 8 humbug                                                                            8 humbug
+ 9 one two three                                                                     9 one two three
+10 four five six                                                                    10 four five six
+11 eight nine ten                                                                   11 seven eight nine ten
+12 zero                                                                             12 zero

tests/evil-udiff/out.w70

+--- evil.orig   2013-06-01 16:36:29.676003599 -0500
++++ evil.new    2013-06-01 16:36:28.280056137 -0500
+@@ -1,12 +1,12 @@
+ 1 blah blah blah                                                          1 blah blah blah
+ 2 humbug                                                                  2 bah humbug
+ 3 one two three                                                           3 one two three
+ 4 four five six                                                           4 four five six
+ 5 -- vim73/src/ui.c      2013-06-01 14:48:45.012467754 -0500              5 ++ vim73/src/ui.c      2013-06-01 14:48:45.012467754 -0500
+ 6 @@ -1,6 +1,6 @@                                                         6 @@ -1,6 +1,6 @@
+ 7 blah blah blah                                                          7 blah blah blah
+ 8 humbug                                                                  8 humbug
+ 9 one two three                                                           9 one two three
+10 four five six                                                          10 four five six
+11 eight nine ten                                                         11 seven eight nine ten
+12 zero                                                                   12 zero