Fix support for modified binary files.

Add tests.

Fixes #10.

Author: dmitshur

diff/diff_test.go

@@ -306,6 +306,43 @@ func TestParseMultiFileDiffHeaders(t *testing.T) {
 				},
 			},
 		},
+		{
+			filename: "sample_multi_file_binary.diff",
+			wantDiffs: []*FileDiff{
+				{
+					OrigName: "a/README.md",
+					OrigTime: nil,
+					NewName:  "b/README.md",
+					NewTime:  nil,
+					Extended: []string{
+						"diff --git a/README.md b/README.md",
+						"index 7b73e04..36cde13 100644",
+					},
+				},
+				{
+					OrigName: "a/data/Font.png",
+					OrigTime: nil,
+					NewName:  "b/data/Font.png",
+					NewTime:  nil,
+					Extended: []string{
+						"diff --git a/data/Font.png b/data/Font.png",
+						"index 17a971d..599f8dd 100644",
+						"Binary files a/data/Font.png and b/data/Font.png differ",
+					},
+					Empty: true,
+				},
+				{
+					OrigName: "a/main.go",
+					OrigTime: nil,
+					NewName:  "b/main.go",
+					NewTime:  nil,
+					Extended: []string{
+						"diff --git a/main.go b/main.go",
+						"index 1aced1e..98a982e 100644",
+					},
+				},
+			},
+		},
 	}
 	for _, test := range tests {
 		diffData, err := ioutil.ReadFile(filepath.Join("testdata", test.filename))
@@ -337,6 +374,7 @@ func TestParseFileDiffAndPrintFileDiff(t *testing.T) {
 		{filename: "sample_file_extended_empty_new.diff"},
 		{filename: "sample_file_extended_empty_deleted.diff"},
 		{filename: "sample_file_extended_empty_rename.diff"},
+		{filename: "sample_file_extended_empty_binary.diff"},
 		{
 			filename:     "empty.diff",
 			wantParseErr: &ParseError{0, 0, ErrExtendedHeadersEOF},
@@ -377,6 +415,7 @@ func TestParseMultiFileDiffAndPrintMultiFileDiff(t *testing.T) {
 		{filename: "sample_multi_file_new.diff", wantFileDiffs: 3},
 		{filename: "sample_multi_file_deleted.diff", wantFileDiffs: 3},
 		{filename: "sample_multi_file_rename.diff", wantFileDiffs: 3},
+		{filename: "sample_multi_file_binary.diff", wantFileDiffs: 3},
 		{filename: "long_line_multi.diff", wantFileDiffs: 3},
 		{filename: "empty.diff", wantFileDiffs: 0},
 		{filename: "empty_multi.diff", wantFileDiffs: 2},

diff/parse.go

@@ -191,7 +191,13 @@ func (r *FileDiffReader) ReadAllHeaders() (*FileDiff, error) {
 			fd.NewName = "/dev/null"
 			fd.Empty = true
 			return fd, nil
-		} else if len(fd.Extended) == 4 && strings.HasPrefix(fd.Extended[2], "rename from ") && strings.HasPrefix(fd.Extended[3], "rename to ") {
+		} else if len(fd.Extended) == 4 && strings.HasPrefix(fd.Extended[2], "rename from ") && strings.HasPrefix(fd.Extended[3], "rename to ") && strings.HasPrefix(fd.Extended[0], "diff --git ") {
+			names := strings.SplitN(fd.Extended[0][len("diff --git "):], " ", 2)
+			fd.OrigName = names[0]
+			fd.NewName = names[1]
+			fd.Empty = true
+			return fd, nil
+		} else if len(fd.Extended) == 3 && strings.HasPrefix(fd.Extended[2], "Binary files ") && strings.HasPrefix(fd.Extended[0], "diff --git ") {
 			names := strings.SplitN(fd.Extended[0][len("diff --git "):], " ", 2)
 			fd.OrigName = names[0]
 			fd.NewName = names[1]
@@ -211,7 +217,12 @@ func (r *FileDiffReader) ReadAllHeaders() (*FileDiff, error) {
 			fd.OrigName = names[0]
 			fd.NewName = "/dev/null"
 			fd.Empty = true
-		} else if len(fd.Extended) == 4 && strings.HasPrefix(fd.Extended[2], "rename from ") && strings.HasPrefix(fd.Extended[3], "rename to ") {
+		} else if len(fd.Extended) == 4 && strings.HasPrefix(fd.Extended[2], "rename from ") && strings.HasPrefix(fd.Extended[3], "rename to ") && strings.HasPrefix(fd.Extended[0], "diff --git ") {
+			names := strings.SplitN(fd.Extended[0][len("diff --git "):], " ", 2)
+			fd.OrigName = names[0]
+			fd.NewName = names[1]
+			fd.Empty = true
+		} else if len(fd.Extended) == 3 && strings.HasPrefix(fd.Extended[2], "Binary files ") && strings.HasPrefix(fd.Extended[0], "diff --git ") {
 			names := strings.SplitN(fd.Extended[0][len("diff --git "):], " ", 2)
 			fd.OrigName = names[0]
 			fd.NewName = names[1]

diff/testdata/sample_file_extended_empty_binary.diff

@@ -0,0 +1,3 @@
+diff --git a/data/Font.png b/data/Font.png
+index 17a971d..599f8dd 100644
+Binary files a/data/Font.png and b/data/Font.png differ

diff/testdata/sample_multi_file_binary.diff

@@ -0,0 +1,29 @@
+diff --git a/README.md b/README.md
+index 7b73e04..36cde13 100644
+--- a/README.md
++++ b/README.md
+@@ -1,6 +1,8 @@
+ Conception-go [![Build Status](https://travis-ci.org/shurcooL/Conception-go.svg?branch=master)](https://travis-ci.org/shurcooL/Conception-go)
+ =============
+
++This is a change.
++
+ This is a work in progress Go implementation of [Conception](https://github.com/shurcooL/Conception#demonstration).
+
+ Conception is an experimental project. It's a platform for researching software development tools and techniques. It is driven by a set of guiding principles. Conception-go targets Go development.
+diff --git a/data/Font.png b/data/Font.png
+index 17a971d..599f8dd 100644
+Binary files a/data/Font.png and b/data/Font.png differ
+diff --git a/main.go b/main.go
+index 1aced1e..98a982e 100644
+--- a/main.go
++++ b/main.go
+@@ -6710,6 +6710,8 @@ func init() {
+ }
+
+ func main() {
++	// Another plain text change.
++
+ 	//defer profile.Start(profile.CPUProfile).Stop()
+ 	//defer profile.Start(profile.MemProfile).Stop()
+