Vendor unmaintained github.com/pmezard/go-difflib#1708
Vendor unmaintained github.com/pmezard/go-difflib#1708brackendawson merged 26 commits intostretchr:masterfrom
Conversation
Ported from python default branch (29764a7bd6ba).
difflib: optimize SplitLines
README: add link to godoc.org
Fixed minor mistake in readme example
brackendawson
force-pushed
the
internal-difflib
branch
from
8ead49f to
8473ebb
Compare
brackendawson
changed the title
|
I love the idea of importing the lib and its history But then, later, did you consider this also? |
|
I'm aware, the idea of changing the library used for this gives me some concern. It's not so bad because it's not actually used for any comparisons. But it does change the diff and it's likely there will be cases where the change is a negative. If this was on a v2 boundary I'd be less hesitant. It's also another library which might be considered unsupported by some. I usually don't share the view but a lot of corporations consider projects which don't have recent work on them to be de-facto unsupported. I sometimes consider these to be "stable", but an aim of the current maintenance of testify is to make it so that users with some requirement to use only supported software don't need to re-write all their tests to remove testify. This PR is one of a few potential options. Substantive discussion will decide which is used. |
dolmen
added
the
internal/refactor
|
@Devourian What is your objection to this change? |
dolmen
changed the title
|
@brackendawson I'm ok with the current code. However I would prefer if we could have a clean branch rebased on top of I've attempted |
|
I'll make a clean version. Also would appreciate not changing the titles of PRs unless it's necessary, it makes it harder to keep track of things that are in progress. |
brackendawson
force-pushed
the
internal-difflib
branch
from
9e71ac2 to
32045bc
Compare
brackendawson
force-pushed
the
internal-difflib
branch
from
32045bc to
a51e3b7
Compare
|
I don't think the rebase tooling in git supports rebasing across unrelated histories, so the only way to make a version of this branch without another merge commit is to repeat this procedure from scratch, which I'm not going to do. I think the best way forward is to merge this with a merge commit, as has been done with many other PRs in this repo. |
brackendawson
force-pushed
the
internal-difflib
branch
from
ad832cd to
4bf5b4f
Compare
brackendawson
force-pushed
the
internal-difflib
branch
2 times, most recently
from
6d2505e to
16c6e3b
Compare
* Merge difflib into internal to preserve history. * Remove unused exported functionality from difflib. * Remove difflib from module's requirements. * Document the origin of difflib in its godocs.
brackendawson
force-pushed
the
internal-difflib
branch
from
16c6e3b to
ce48cb3
Compare
|
@dolmen or @ccoVeille I've re-based this PR, it's not trivial to do so I'd appreciate it if you could consider re-approval soon. |
brackendawson
dismissed
dolmen’s stale review
As previously stated dolmen is happy with the code and wanted only a rebase: #1708 (comment) That rebase has been delivered.
|
Hi, Would it be possible to share an estimated public release date for this change? |
|
I'd estimate around February. |
|
Hello @brackendawson |
11 participants
Summary
Bring the un-maintained
github.com/pmezard/go-difflib/diffliblibrary into testify and adopt support of the package.Changes
github.com/pmezard/go-difflib/difflibpackage to.../internal/difflibso that it cannot be imported by other modules.internal/difflibinto testify, preserving all git history, and preserving the difflib license.github.com/pmezard/go-difflibfrom testify's requirements.Motivation
Difflib is explicitly unmaintained but depended on by testify.
Related issues
Closes #1159