Indefero Commit Details

Date:

2011-10-04 19:44:04 (13 years 2 months ago)

Author:

Thomas Keller

Branch:

develop, feature.diff-whitespace, feature.wiki-default-page, release-1.2, release-1.3

Commit:

d0e29777469897fd8bfd21b11b16bb57e87d38e1

Parents:

1be91e5a2aefe59dfe4726bbc7d21d2383e640ce

Message:

Add support for line ending detection in our diff parser.

Line endings are now preserved during the diff parsing. When the diff
is then rendered later on, we replace non-printable characters by their
ordinal counterparts, so a user can easily grasp changes when a hunk
comes with edits that might be invisible at first.

The expected format for the diff test suite has changed from serialized
PHP to var_export, which is easier readable, editable and understandable,
while still keeping parsable as well.

Support for old Macintosh line endings could not be added, mainly because
modern SCMs do not support single \r in their unified diff output either
and working around and parsing these "lines" would have been a major
headache with not much outcome (given the fact that all Macs that have been
sold since 2001 or 2002 have been BSD-based and as such used Unix line
endings by default).

This commit fixes issue 636.

Changes:

File differences

-38
39 39
40 40
41 
42 
43 41
44 42
45 
43
46 44
47 45
48 46
+            }␊
␊
            $expectedfile = str_replace('.diff', '.expected', $difffile);␊
            $expectedcontent = @file_get_contents($expectedfile);␊
␊
            $diffcontent = file_get_contents($difffile);␊
            $diff = new IDF_Diff($diffcontent, $diffprefix);␊
            $this->assertEquals(unserialize($expectedcontent),␊
            $this->assertEquals(require_once($expectedfile),␊
                                $diff->parse(),␊
                                'parsed diff '.$difffile.' does not match');␊
        }␊
             }␊
 ␊
             $expectedfile = str_replace('.diff', '.expected', $difffile);␊
-            $expectedcontent = @file_get_contents($expectedfile);␊
-␊
             $diffcontent = file_get_contents($difffile);␊
             $diff = new IDF_Diff($diffcontent, $diffprefix);␊
-            $this->assertEquals(unserialize($expectedcontent),␊
+            $this->assertEquals(require_once($expectedfile),␊
                                 $diff->parse(),␊
                                 'parsed diff '.$difffile.' does not match');␊
         }␊

-
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
+a:1:{s:1:"a";a:2:{s:6:"chunks";a:1:{i:0;a:1:{i:0;a:3:{i:0;s:0:"";i:1;s:1:"1";i:2;s:3:"abc";}}}s:10:"chunks_def";a:1:{i:0;a:2:{i:0;a:2:{i:0;s:1:"0";i:1;s:1:"0";}i:1;a:2:{i:0;s:1:"1";i:1;i:1;}}}}}
<?php return array (␊
  'a' => ␊
  array (␊
    'chunks' => ␊
    array (␊
      0 => ␊
      array (␊
        0 => ␊
        array (␊
          0 => '',␊
          1 => '1',␊
          2 => "abc\r\n",␊
        ),␊
      ),␊
    ),␊
    'chunks_def' => ␊
    array (␊
      0 => ␊
      array (␊
        0 => ␊
        array (␊
          0 => '0',␊
          1 => '0',␊
        ),␊
        1 => ␊
        array (␊
          0 => '1',␊
          1 => 1,␊
        ),␊
      ),␊
    ),␊
  ),␊
);
-a:1:{s:1:"a";a:2:{s:6:"chunks";a:1:{i:0;a:1:{i:0;a:3:{i:0;s:0:"";i:1;s:1:"1";i:2;s:3:"abc";}}}s:10:"chunks_def";a:1:{i:0;a:2:{i:0;a:2:{i:0;s:1:"0";i:1;s:1:"0";}i:1;a:2:{i:0;s:1:"1";i:1;i:1;}}}}}
+<?php return array (␊
+  'a' => ␊
+  array (␊
+    'chunks' => ␊
+    array (␊
+=> ␊
+      array (␊
+=> ␊
+        array (␊
+=> '',␊
+=> '1',␊
+=> "abc\r\n",␊
+        ),␊
+      ),␊
+    ),␊
+    'chunks_def' => ␊
+    array (␊
+=> ␊
+      array (␊
+=> ␊
+        array (␊
+=> '0',␊
+=> '0',␊
+        ),␊
+=> ␊
+        array (␊
+=> '1',␊
+=> 1,␊
+        ),␊
+      ),␊
+    ),␊
+  ),␊
+);

-
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
+a:1:{s:1:"a";a:2:{s:6:"chunks";a:1:{i:0;a:1:{i:0;a:3:{i:0;s:0:"";i:1;s:1:"1";i:2;s:3:"foo";}}}s:10:"chunks_def";a:1:{i:0;a:2:{i:0;a:2:{i:0;s:1:"0";i:1;s:1:"0";}i:1;a:2:{i:0;s:1:"1";i:1;s:1:"1";}}}}}
<?php return array (␊
  'a' => ␊
  array (␊
    'chunks' => ␊
    array (␊
      0 => ␊
      array (␊
        0 => ␊
        array (␊
          0 => '',␊
          1 => '1',␊
          2 => "foo\n",␊
        ),␊
      ),␊
    ),␊
    'chunks_def' => ␊
    array (␊
      0 => ␊
      array (␊
        0 => ␊
        array (␊
          0 => '0',␊
          1 => '0',␊
        ),␊
        1 => ␊
        array (␊
          0 => '1',␊
          1 => '1',␊
        ),␊
      ),␊
    ),␊
  ),␊
);
-a:1:{s:1:"a";a:2:{s:6:"chunks";a:1:{i:0;a:1:{i:0;a:3:{i:0;s:0:"";i:1;s:1:"1";i:2;s:3:"foo";}}}s:10:"chunks_def";a:1:{i:0;a:2:{i:0;a:2:{i:0;s:1:"0";i:1;s:1:"0";}i:1;a:2:{i:0;s:1:"1";i:1;s:1:"1";}}}}}
+<?php return array (␊
+  'a' => ␊
+  array (␊
+    'chunks' => ␊
+    array (␊
+=> ␊
+      array (␊
+=> ␊
+        array (␊
+=> '',␊
+=> '1',␊
+=> "foo\n",␊
+        ),␊
+      ),␊
+    ),␊
+    'chunks_def' => ␊
+    array (␊
+=> ␊
+      array (␊
+=> ␊
+        array (␊
+=> '0',␊
+=> '0',␊
+        ),␊
+=> ␊
+        array (␊
+=> '1',␊
+=> '1',␊
+        ),␊
+      ),␊
+    ),␊
+  ),␊
+);

-
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
+a:1:{s:1:"a";a:2:{s:6:"chunks";a:1:{i:0;a:1:{i:0;a:3:{i:0;s:0:"";i:1;s:1:"1";i:2;s:3:"abc";}}}s:10:"chunks_def";a:1:{i:0;a:2:{i:0;a:2:{i:0;s:1:"0";i:1;s:1:"0";}i:1;a:2:{i:0;s:1:"1";i:1;i:1;}}}}}
<?php return array (␊
  'a' => ␊
  array (␊
    'chunks' => ␊
    array (␊
      0 => ␊
      array (␊
        0 => ␊
        array (␊
          0 => '',␊
          1 => '1',␊
          2 => "abc\n",␊
        ),␊
      ),␊
    ),␊
    'chunks_def' => ␊
    array (␊
      0 => ␊
      array (␊
        0 => ␊
        array (␊
          0 => '0',␊
          1 => '0',␊
        ),␊
        1 => ␊
        array (␊
          0 => '1',␊
          1 => 1,␊
        ),␊
      ),␊
    ),␊
  ),␊
);
-a:1:{s:1:"a";a:2:{s:6:"chunks";a:1:{i:0;a:1:{i:0;a:3:{i:0;s:0:"";i:1;s:1:"1";i:2;s:3:"abc";}}}s:10:"chunks_def";a:1:{i:0;a:2:{i:0;a:2:{i:0;s:1:"0";i:1;s:1:"0";}i:1;a:2:{i:0;s:1:"1";i:1;i:1;}}}}}
+<?php return array (␊
+  'a' => ␊
+  array (␊
+    'chunks' => ␊
+    array (␊
+=> ␊
+      array (␊
+=> ␊
+        array (␊
+=> '',␊
+=> '1',␊
+=> "abc\n",␊
+        ),␊
+      ),␊
+    ),␊
+    'chunks_def' => ␊
+    array (␊
+=> ␊
+      array (␊
+=> ␊
+        array (␊
+=> '0',␊
+=> '0',␊
+        ),␊
+=> ␊
+        array (␊
+=> '1',␊
+=> 1,␊
+        ),␊
+      ),␊
+    ),␊
+  ),␊
+);

-
2
3
4
5
6
7
8
9
10
+diff --git a/lineendings b/lineendings␊
index 7c2b7ec..9c59944 100644␊
--- a/lineendings␊
+++ b/lineendings␊
@@ -1,3 +1,4 @@␊
+Unix, again␊
 Windows␍␊
 Unix␊
 Old Macintosh␍Nothing␊
\ No newline at end of file␊
+diff --git a/lineendings b/lineendings␊
+index 7c2b7ec..9c59944 100644␊
+--- a/lineendings␊
++++ b/lineendings␊
+@@ -1,3 +1,4 @@␊
++Unix, again␊
+ Windows␍␊
+ Unix␊
+ Old Macintosh␍Nothing␊
+\ No newline at end of file␊

Download the corresponding diff file

Indefero

File differences

Branches

Tags