Skip to content

Update diff with meyers_difference #5

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

Jump to bottom
Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Update diff with meyers_difference #5

wants to merge 5 commits into from

Conversation

dgoldie
Copy link

@dgoldie dgoldie commented Jul 9, 2021

No description provided.

dgoldie and others added 5 commits July 2, 2021 13:11
@dgoldie
Use Hex diff library for diff and patch
09b200f
@dgoldie
diff and patch
97cfcec 
- using Hex diff and patch
- convert diff to map to pass through json
- 3 test cases
  - insert row
  - delete row
  - insert and delete row
@dgoldie
Update Source.diff/patch with
623991a 
Replace Hex diff and use String.myers_difference
@dgoldie
remove Hex diff from deps
4fa0f47
@andyl
Merge branch 'master' into update_diff_with_meyers
2470ba0
@andyl
Copy link
Owner

andyl commented Jul 16, 2021

Doug: thanks a lot for this! I merged your PR into a dev branch, ran the tests and had a bunch of failed cases. Also: I wonder if the Meyers diff can be translated to/from JSON. Meyer's diff produces a data structure like [[:ins, "Text"], [:eq, "x = 1\n"]]. When you translate back/forth to JSON, the atoms are converted to strings. Will Meyer's diff work with string "keys"?

Please update PR with:

  • 100% passing tests
  • passing tests that demonstrate JSON conversion

THANKS!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@dgoldie @andyl