Skip to content

Add support for new/removed binary files. #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 27, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions diff/diff_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,21 @@ func TestParseFileDiffHeaders(t *testing.T) {
},
},
},
{
filename: "sample_file_extended_empty_new_binary.diff",
wantDiff: &FileDiff{
OrigName: "/dev/null",
OrigTime: nil,
NewName: "b/diff/binary-image.png",
NewTime: nil,
Extended: []string{
"diff --git a/diff/binary-image.png b/diff/binary-image.png",
"new file mode 100644",
"index 0000000..b51756e",
"Binary files /dev/null and b/diff/binary-image.png differ",
},
},
},
{
filename: "sample_file_extended_empty_deleted.diff",
wantDiff: &FileDiff{
Expand All @@ -149,6 +164,21 @@ func TestParseFileDiffHeaders(t *testing.T) {
},
},
},
{
filename: "sample_file_extended_empty_deleted_binary.diff",
wantDiff: &FileDiff{
OrigName: "a/187/player/random/gopher-0.png",
OrigTime: nil,
NewName: "/dev/null",
NewTime: nil,
Extended: []string{
"diff --git a/187/player/random/gopher-0.png b/187/player/random/gopher-0.png",
"deleted file mode 100644",
"index aebdfc7..0000000",
"Binary files a/187/player/random/gopher-0.png and /dev/null differ",
},
},
},
{
filename: "sample_file_extended_empty_rename.diff",
wantDiff: &FileDiff{
Expand Down Expand Up @@ -365,7 +395,9 @@ func TestParseFileDiffAndPrintFileDiff(t *testing.T) {
{filename: "sample_file_no_timestamp.diff"},
{filename: "sample_file_extended.diff"},
{filename: "sample_file_extended_empty_new.diff"},
{filename: "sample_file_extended_empty_new_binary.diff"},
{filename: "sample_file_extended_empty_deleted.diff"},
{filename: "sample_file_extended_empty_deleted_binary.diff"},
{filename: "sample_file_extended_empty_rename.diff"},
{filename: "sample_file_extended_empty_binary.diff"},
{
Expand Down
8 changes: 6 additions & 2 deletions diff/parse.go
Original file line number Diff line number Diff line change
Expand Up @@ -329,12 +329,16 @@ func (r *FileDiffReader) ReadExtendedHeaders() ([]string, error) {
// that follow. It updates fd fields from the parsed extended headers.
func handleEmpty(fd *FileDiff) (wasEmpty bool) {
switch {
case len(fd.Extended) == 3 && strings.HasPrefix(fd.Extended[1], "new file mode ") && strings.HasPrefix(fd.Extended[0], "diff --git "):
case (len(fd.Extended) == 3 || len(fd.Extended) == 4 && strings.HasPrefix(fd.Extended[3], "Binary files ")) &&
strings.HasPrefix(fd.Extended[1], "new file mode ") && strings.HasPrefix(fd.Extended[0], "diff --git "):

names := strings.SplitN(fd.Extended[0][len("diff --git "):], " ", 2)
fd.OrigName = "/dev/null"
fd.NewName = names[1]
return true
case len(fd.Extended) == 3 && strings.HasPrefix(fd.Extended[1], "deleted file mode ") && strings.HasPrefix(fd.Extended[0], "diff --git "):
case (len(fd.Extended) == 3 || len(fd.Extended) == 4 && strings.HasPrefix(fd.Extended[3], "Binary files ")) &&
strings.HasPrefix(fd.Extended[1], "deleted file mode ") && strings.HasPrefix(fd.Extended[0], "diff --git "):

names := strings.SplitN(fd.Extended[0][len("diff --git "):], " ", 2)
fd.OrigName = names[0]
fd.NewName = "/dev/null"
Expand Down
4 changes: 4 additions & 0 deletions diff/testdata/sample_file_extended_empty_deleted_binary.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
diff --git a/187/player/random/gopher-0.png b/187/player/random/gopher-0.png
deleted file mode 100644
index aebdfc7..0000000
Binary files a/187/player/random/gopher-0.png and /dev/null differ
4 changes: 4 additions & 0 deletions diff/testdata/sample_file_extended_empty_new_binary.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
diff --git a/diff/binary-image.png b/diff/binary-image.png
new file mode 100644
index 0000000..b51756e
Binary files /dev/null and b/diff/binary-image.png differ