Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
8623a88
Initial port with SequenceMatcher and unified_diff()
pmezard Oct 20, 2013
3859285
Reorganize repository
pmezard Oct 27, 2013
35c8dc4
difflib_test: add more tests
pmezard Nov 23, 2013
6f90939
difflib: implement context diffs
pmezard Nov 23, 2013
06eeb1d
difflib: move and publish splitLines in difflib
pmezard Nov 23, 2013
4d91f93
README: make it less experimental, add examples
pmezard Nov 23, 2013
6fb7d10
difflib: turn some tests into examples, fix documentation
pmezard Nov 23, 2013
a77cab6
difflib: extract summary line from package documentation
pmezard Nov 23, 2013
8fee7c0
Add travis configuration file
pmezard Apr 19, 2015
b65e32b
difflib: optimize SplitLines
rdwilliamson May 9, 2015
f78a839
Merge pull request #1 from rdwilliamson/master
May 10, 2015
ac475e8
.travis.yml: update stable go version to 1.5
pmezard Oct 27, 2015
dedecaa
README: add link to godoc.org
pmezard Oct 28, 2015
d8ed262
Merge pull request #2 from pmezard/add-godoc-link
pmezard Oct 28, 2015
901e4f8
fix WriteUnifiedDiff fmt.Sprintf format error
visualfc Dec 7, 2015
017ffa6
fix WriteContextDiff fmt.Sprintf format error
visualfc Dec 7, 2015
7b7f521
difflib: fix error handling in WriteContextDiff
pmezard Dec 7, 2015
e8554b8
Merge branch 'fix-formatting'
pmezard Dec 7, 2015
509b2ff
Skip file headers if FromFile/ToFile are empty
shazow Dec 8, 2015
4d60064
tests: test header is omitted if file names are empty
pmezard Jan 10, 2016
792786c
Merge branch 'shazow-master'
pmezard Jan 10, 2016
4d7e5c1
Update README.md
justbuchanan Jan 2, 2018
1ef1646
README: end of maintenance notice.
pmezard Dec 26, 2018
fca3d27
travis: remove travis integration
pmezard Dec 26, 2018
5d4384e
Merge pull request #10 from justbuchanan/master
pmezard Dec 26, 2018
ce48cb3
Move difflib into testify
brackendawson Aug 29, 2025
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
2 changes: 1 addition & 1 deletion assert/assertions.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"unicode/utf8"

"github.com/davecgh/go-spew/spew"
"github.com/pmezard/go-difflib/difflib"
"github.com/stretchr/testify/internal/difflib"

// Wrapper around gopkg.in/yaml.v3
"github.com/stretchr/testify/assert/yaml"
Expand Down
1 change: 0 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ go 1.17

require (
github.com/davecgh/go-spew v1.1.1
github.com/pmezard/go-difflib v1.0.0
github.com/stretchr/objx v0.5.2 // To avoid a cycle the version of testify used by objx should be excluded below
gopkg.in/yaml.v3 v3.0.1
)
Expand Down
1 change: 0 additions & 1 deletion go.sum
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
Expand Down
27 changes: 27 additions & 0 deletions internal/difflib/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
Copyright (c) 2013, Patrick Mezard
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:

Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
The names of its contributors may not be used to endorse or promote
products derived from this software without specific prior written
permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Loading