Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Resolve #65 - Also add even more tests for checking `ldiff` results against `diff` results. - Fix issues with diff/ldiff output highlighted by the above tests. - Add a parameter to indicate that the hunk being processed is the _last_ hunk; this results in correct counting of the hunk size. - The misplaced chunks were happening because of an improper `.abs` on `#diff_size`, when the `.abs` needed to be on the finding of the maximum diff size.
- Loading branch information
1 parent
99f65fd
commit dbb36e6
Showing
19 changed files
with
330 additions
and
100 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
--- spec/fixtures/aX 2019-02-01 22:29:34.000000000 -0500 | ||
+++ spec/fixtures/bXaX 2019-02-01 22:29:43.000000000 -0500 | ||
--- spec/fixtures/aX 2020-06-23 11:15:32.000000000 -0400 | ||
+++ spec/fixtures/bXaX 2020-06-23 11:15:32.000000000 -0400 | ||
@@ -1 +1 @@ | ||
-aX | ||
+bXaX |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
3c3 | ||
< "description": "hi" | ||
--- | ||
> "description": "lo" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
*** spec/fixtures/old-chef 2020-06-23 23:18:20.000000000 -0400 | ||
--- spec/fixtures/new-chef 2020-06-23 23:18:20.000000000 -0400 | ||
*************** | ||
*** 1,4 **** | ||
{ | ||
"name": "x", | ||
! "description": "hi" | ||
} | ||
\ No newline at end of file | ||
--- 1,4 ---- | ||
{ | ||
"name": "x", | ||
! "description": "lo" | ||
} | ||
\ No newline at end of file |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
3c | ||
"description": "lo" | ||
. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
c3 | ||
"description": "lo" | ||
. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,9 @@ | ||
--- spec/fixtures/old-chef 2019-02-01 21:57:15.000000000 -0400 | ||
+++ spec/fixtures/new-chef 2019-02-01 21:57:29.000000000 -0400 | ||
@@ -1,5 +1,5 @@ | ||
--- spec/fixtures/old-chef 2020-06-23 23:18:20.000000000 -0400 | ||
+++ spec/fixtures/new-chef 2020-06-23 23:18:20.000000000 -0400 | ||
@@ -1,4 +1,4 @@ | ||
{ | ||
"name": "x", | ||
- "description": "hi" | ||
+ "description": "lo" | ||
} | ||
\ No newline at end of file |
Oops, something went wrong.