Skip to content

Fixed all of the tests/bugs. Test error output improvements. Minor API change. #2

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.

Sign up for GitHub

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
sergi merged 27 commits into from
Mar 13, 2013
Merged

Fixed all of the tests/bugs. Test error output improvements. Minor API change. #2

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
6cb8fe6
reworked assertions in tests to be more informative
rwcarlsen Mar 5, 2013
085823a
fixed bug where array modifications weren't returned due to non-point…
rwcarlsen Mar 5, 2013
5dbd4a7
fixed remaining bugs in DiffCharsToLines
rwcarlsen Mar 5, 2013
26f1870
fixed bug in reverse overlap elimination - added pretty printing for …
rwcarlsen Mar 5, 2013
066b635
fixed DiffFromDelta bug where byte slicing was used instead of rune s…
rwcarlsen Mar 5, 2013
4cbec32
Changes 'deadline' to be int64 instead of int32
akovaski Jan 31, 2013
f23538d
removed TODO form DiffBisect lines because they are done
akovaski Jan 31, 2013
71e2760
concat function is not needed, builtin append works in place
akovaski Feb 2, 2013
f7e2296
fixed bug in my diffMain refactor and fixed diffCompute bug where Dif…
rwcarlsen Mar 5, 2013
987f9cb
added int min function. Improved pretty test fail output for assertDi…
rwcarlsen Mar 5, 2013
1307524
Added a New function that creates a default DiffMatchPatch
rwcarlsen Mar 6, 2013
1f56a9f
fixed a bug in DiffBisect wrt runes vs bytes
rwcarlsen Mar 7, 2013
29b9f95
go fmt
rwcarlsen Mar 7, 2013
2e246ae
switched to a different assert package
rwcarlsen Mar 7, 2013
ce24a72
fixed bug due to rounding/float/int conversion
rwcarlsen Mar 8, 2013
3dd7699
deadline is now time.Time. Fixed timeout bug wrt seconds vs 1000*sec…
rwcarlsen Mar 8, 2013
24c1575
fixed var shadowing bug in diffLineMode
rwcarlsen Mar 9, 2013
25bc765
added type-safe wrapper DiffMain around private diffMain - no more in…
rwcarlsen Mar 8, 2013
90384d2
used utf8 decoderuneinstring funcs for forward/reverse range rather t…
rwcarlsen Mar 9, 2013
8c0e3a1
cleaned up func args. Fixed uninitialized bisect slices
rwcarlsen Mar 9, 2013
2b71292
cleaned up min/max calcs. Fixed patch bug where AddContext return val…
rwcarlsen Mar 10, 2013
2f08e75
fixed escape analysis test where go url query escaper uses upper case…
rwcarlsen Mar 10, 2013
cf10e0b
reordered some functions, types. Deleted unused LineDiff type. Fixed …
rwcarlsen Mar 11, 2013
e66675f
fixed patch slicing bugs in patch_splitMax function
rwcarlsen Mar 11, 2013
99dad8e
fixed nullpadding creation err
rwcarlsen Mar 11, 2013
7fc9952
fixed match ratio calc bug
rwcarlsen Mar 11, 2013
3d2b8dd
go fmt
rwcarlsen Mar 11, 2013
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
Prev Previous commit
Next Next commit
fixed nullpadding creation err
  • Loading branch information
@rwcarlsen
rwcarlsen committed Mar 11, 2013
commit 99dad8e86531ddb3e8692c7abe3867dc3f0fbfe8
58 changes: 27 additions & 31 deletions diff/dmp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1872,51 +1872,47 @@ func (dmp *DiffMatchPatch) PatchAddPadding(patches []Patch) string {
paddingLength := dmp.PatchMargin
nullPadding := ""
for x := 1; x <= paddingLength; x++ {
nullPadding += strconv.FormatInt(int64(x), 10)
nullPadding += string(x)
}

// Bump all the patches forward.
for _, aPatch := range patches {
aPatch.start1 += paddingLength
aPatch.start2 += paddingLength
for i, _ := range patches {
patches[i].start1 += paddingLength
patches[i].start2 += paddingLength
}

// Add some padding on start of first diff.
patch := patches[0]
diffs := patch.diffs
if len(diffs) == 0 || diffs[0].Type != DiffEqual {
if len(patches[0].diffs) == 0 || patches[0].diffs[0].Type != DiffEqual {
// Add nullPadding equality.
diffs = append(diffs, Diff{DiffEqual, nullPadding})
patch.start1 -= paddingLength // Should be 0.
patch.start2 -= paddingLength // Should be 0.
patch.length1 += paddingLength
patch.length2 += paddingLength
} else if paddingLength > len(diffs[0].Text) {
patches[0].diffs = append([]Diff{Diff{DiffEqual, nullPadding}}, patches[0].diffs...)
patches[0].start1 -= paddingLength // Should be 0.
patches[0].start2 -= paddingLength // Should be 0.
patches[0].length1 += paddingLength
patches[0].length2 += paddingLength
} else if paddingLength > len(patches[0].diffs[0].Text) {
// Grow first equality.
firstDiff := diffs[0]
extraLength := paddingLength - len(firstDiff.Text)
firstDiff.Text = nullPadding[len(firstDiff.Text):] + firstDiff.Text
patch.start1 -= extraLength
patch.start2 -= extraLength
patch.length1 += extraLength
patch.length2 += extraLength
extraLength := paddingLength - len(patches[0].diffs[0].Text)
patches[0].diffs[0].Text = nullPadding[len(patches[0].diffs[0].Text):] + patches[0].diffs[0].Text
patches[0].start1 -= extraLength
patches[0].start2 -= extraLength
patches[0].length1 += extraLength
patches[0].length2 += extraLength
}

// Add some padding on end of last diff.
patch = patches[len(patches)-1]
diffs = patch.diffs
if len(diffs) == 0 || diffs[len(diffs)-1].Type != DiffEqual {
last := len(patches) - 1
if len(patches[last].diffs) == 0 || patches[last].diffs[len(patches[last].diffs)-1].Type != DiffEqual {
// Add nullPadding equality.
diffs = append(diffs, Diff{DiffEqual, nullPadding})
patch.length1 += paddingLength
patch.length2 += paddingLength
} else if paddingLength > len(diffs[len(diffs)-1].Text) {
patches[last].diffs = append(patches[last].diffs, Diff{DiffEqual, nullPadding})
patches[last].length1 += paddingLength
patches[last].length2 += paddingLength
} else if paddingLength > len(patches[last].diffs[len(patches[last].diffs)-1].Text) {
// Grow last equality.
lastDiff := diffs[len(diffs)-1]
lastDiff := patches[last].diffs[len(patches[last].diffs)-1]
extraLength := paddingLength - len(lastDiff.Text)
lastDiff.Text += nullPadding[0:extraLength]
patch.length1 += extraLength
patch.length2 += extraLength
patches[last].diffs[len(patches[last].diffs)-1].Text += nullPadding[:extraLength]
patches[last].length1 += extraLength
patches[last].length2 += extraLength
}

return nullPadding
Expand Down
4 changes: 2 additions & 2 deletions diff/dmp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1158,15 +1158,15 @@ func Test_PatchSplitMax(t *testing.T) {
assert.Equal(t, oldToText, dmp.PatchToText(patches))

patches = dmp.PatchMake("1234567890123456789012345678901234567890123456789012345678901234567890", "abc")
dmp.PatchSplitMax(patches)
patches = dmp.PatchSplitMax(patches)
assert.Equal(t, "@@ -1,32 +1,4 @@\n-1234567890123456789012345678\n 9012\n@@ -29,32 +1,4 @@\n-9012345678901234567890123456\n 7890\n@@ -57,14 +1,3 @@\n-78901234567890\n+abc\n", dmp.PatchToText(patches))

patches = dmp.PatchMake("abcdefghij , h : 0 , t : 1 abcdefghij , h : 0 , t : 1 abcdefghij , h : 0 , t : 1", "abcdefghij , h : 1 , t : 1 abcdefghij , h : 1 , t : 1 abcdefghij , h : 0 , t : 1")
dmp.PatchSplitMax(patches)
assert.Equal(t, "@@ -2,32 +2,32 @@\n bcdefghij , h : \n-0\n+1\n , t : 1 abcdef\n@@ -29,32 +29,32 @@\n bcdefghij , h : \n-0\n+1\n , t : 1 abcdef\n", dmp.PatchToText(patches))
}

func test_PatchAddPadding(t *testing.T) {
func Test_PatchAddPadding(t *testing.T) {
dmp := New()
var patches []Patch
patches = dmp.PatchMake("", "test")
Expand Down