Skip to content

if we can't merge the diffs, favor the diff being transformed #1

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

if we can't merge the diffs, favor the diff being transformed #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions dist/python/jsondiff/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,8 +348,12 @@ def transform_object_diff(a, b, s, policy=None):
del ac[k]
a_patches = DMP.patch_make(sk, DMP.diff_fromDelta(sk, op['v']))
b_patches = DMP.patch_make(sk, DMP.diff_fromDelta(sk, b[k]['v']))
b_text = DMP.patch_apply(b_patches, sk)[0]
ab_text = DMP.patch_apply(a_patches, b_text)[0]
b_text, b_applied = DMP.patch_apply(b_patches, sk)
ab_text, a_applied = DMP.patch_apply(a_patches, b_text)

if False in a_applied or False in b_applied:
ab_text, a_applied = DMP.patch_apply(a_patches, sk)

diffs = DMP.diff_main(b_text, ab_text)
if len(diffs) > 2:
DMP.diff_cleanupEfficiency(diffs)
Expand Down
18 changes: 18 additions & 0 deletions dist/python/jsondiff/tests/test_differ.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,24 @@ def test_object_diffs(self):
b = {'blah':{'hi':'there'}, 'num':-10, 'new':{'list':['a', 'b', 'c']}}
self.assertTrue(object_equals(b, apply_object_diff(a, object_diff(a, b))))

def test_bad_transform(self):
o = {'log' : 'Original Captains Log'}
a = {'log' : 'Local Captains Log'}
b = {'log' : 'Remote Captains Log'}

a_diff = diff(o, a)['v']
b_diff = diff(o, b)['v']

a_prime_diff = transform_object_diff(a_diff, b_diff, o)

ob = apply_object_diff(o, b_diff)

self.assertTrue(object_equals(ob, b))

oba = apply_object_diff(ob, a_prime_diff)

self.assertFalse(object_equals(oba, ob))
self.assertTrue(object_equals(oba, a))

if __name__ == '__main__':
unittest.main()