Skip to content
Open
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
18 changes: 12 additions & 6 deletions diffparser.go
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,10 @@ func Parse(diffString string) (*Diff, error) {
var ADDEDCount int
var REMOVEDCount int
var inHunk bool
oldFilePrefix := "--- a/"
newFilePrefix := "+++ b/"
oldFilePrefix1 := "--- a/"
oldFilePrefix2 := "rename from "
newFilePrefix1 := "+++ b/"
newFilePrefix2 := "rename to "

var diffPosCount int
var firstHunkInFile bool
Expand Down Expand Up @@ -177,10 +179,14 @@ func Parse(diffString string) (*Diff, error) {
file.Mode = DELETED
case l == "--- /dev/null":
file.Mode = NEW
case strings.HasPrefix(l, oldFilePrefix):
file.OrigName = strings.TrimPrefix(l, oldFilePrefix)
case strings.HasPrefix(l, newFilePrefix):
file.NewName = strings.TrimPrefix(l, newFilePrefix)
case strings.HasPrefix(l, oldFilePrefix1):
file.OrigName = strings.TrimPrefix(l, oldFilePrefix1)
case strings.HasPrefix(l, newFilePrefix1):
file.NewName = strings.TrimPrefix(l, newFilePrefix1)
case strings.HasPrefix(l, oldFilePrefix2):
file.OrigName = strings.TrimPrefix(l, oldFilePrefix2)
case strings.HasPrefix(l, newFilePrefix2):
file.NewName = strings.TrimPrefix(l, newFilePrefix2)
case strings.HasPrefix(l, "@@ "):
if firstHunkInFile {
diffPosCount = 0
Expand Down
7 changes: 6 additions & 1 deletion diffparser_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ func setup(t *testing.T) *Diff {

diff, err := Parse(string(byt))
require.NoError(t, err)
require.Equal(t, len(diff.Files), 6)
require.Equal(t, len(diff.Files), 7)

return diff
}
Expand Down Expand Up @@ -60,6 +60,11 @@ func TestFileModeAndNaming(t *testing.T) {
origName: "symlink",
newName: "",
},
{
mode: MODIFIED,
origName: "example",
newName: "example1",
},
} {
file := diff.Files[i]
t.Logf("testing file: %v", file)
Expand Down
4 changes: 4 additions & 0 deletions example.diff
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,7 @@ index 03b9162..0000000
@@ -1 +0,0 @@
-symlink-destination
\ No newline at end of file
diff --git a/example b/example1
similarity index 100%
rename from example
rename to example1