going down the ignore order

Author: seperman

deepdiff/delta.py

@@ -4,7 +4,7 @@
 from decimal import Decimal
 from deepdiff import DeepDiff
 from deepdiff.serialization import pickle_load
-from deepdiff.helper import py_current_version, strings
+from deepdiff.helper import py_current_version, strings, short_repr
 from deepdiff.path import _path_to_elements, _get_nested_obj, GET, GETATTR
 
 MINIMUM_PY_FOR_DELTA = Decimal('3.6')
@@ -114,6 +114,9 @@ def __init__(self, diff=None, delta_path=None, mutate=False, verify_symmetry=Fal
         self.raise_errors = raise_errors
         self.log_errors = log_errors
 
+    def __repr__(self):
+        return "<Delta: {}>".format(short_repr(self.diff, max_length=100))
+
     def reset(self):
         self.post_process_paths_to_convert = {}
 
@@ -127,13 +130,14 @@ def __add__(self, other):
         self._do_set_item_added()
         self._do_set_item_removed()
         self._do_type_changes()
+        # NOTE: the remove iterable action needs to happen BEFORE
+        # all the other iterables to match the reverse of order of operations in DeepDiff
+        self._do_iterable_item_removed()
         self._do_iterable_item_added()
         self._do_dictionary_item_added()
         self._do_dictionary_item_removed()
         self._do_attribute_added()
         self._do_attribute_removed()
-        # NOTE: the remove iterable action needs to happen AFTER all the other iterables.
-        self._do_iterable_item_removed()
         self._do_post_process()
 
         other = self.root
@@ -371,7 +375,6 @@ def _do_set_item(self, items, func):
             self._simple_set_elem_value(parent, path_for_err_reporting=path, elem=elem, value=new_value, action=action)
 
 
-
 if __name__ == "__main__":  # pragma: no cover
     import doctest
     doctest.testmod()

deepdiff/diff.py

@@ -771,7 +771,8 @@ def to_delta_dict(self, directed=True):
                     for path, value in report_value.items():
                         if isinstance(value, Mapping) and 'old_value' in value:
                             del value['old_value']
-
+        if self.ignore_order:
+            result['ignore_order'] = True
         return result
 
 

tests/test_delta.py

@@ -380,3 +380,60 @@ def test_delta_cases(self, t1, t2, deepdiff_kwargs, to_delta_kwargs, expected_de
         assert expected_delta_dict == delta_dict
         delta = Delta(diff, verify_symmetry=False, raise_errors=True)
         assert t1 + delta == t2
+
+
+DELTA_IGNORE_ORDER_CASES = [
+    {
+        't1': [1, 2, 'B', 3],
+        't2': [1, 2, 3, 5],
+        'deepdiff_kwargs': {
+            'ignore_order': True,
+            'report_repetition': True
+        },
+        'to_delta_kwargs': {},
+        'expected_delta_dict': {
+            'ignore_order': True,
+            'iterable_item_added': {
+                'root[3]': 5
+            },
+            'iterable_item_removed': {
+                'root[2]': 'B'
+            }
+        },
+    },
+    {
+        't1': [1, 2, 'B', 3, 'B', 'B', 4],
+        't2': [1, 2, 3, 5],
+        'deepdiff_kwargs': {
+            'ignore_order': True,
+            'report_repetition': False
+        },
+        'to_delta_kwargs': {},
+        'expected_delta_dict': {
+            'iterable_item_added': {
+                'root[3]': 5
+            },
+            'iterable_item_removed': {
+                'root[6]': 4,
+                'root[2]': 'B'
+            },
+            'ignore_order': True
+        },
+    },
+]
+
+
+DELTA_IGNORE_ORDER_CASES_PARAMS = parameterize_cases(DELTA_IGNORE_ORDER_CASES)
+
+
+@pytest.mark.skipif(DISABLE_DELTA, reason=DELTA_SKIP_MSG)
+class TestIgnoreOrderDelta:
+
+    @pytest.mark.parametrize('t1, t2, deepdiff_kwargs, to_delta_kwargs, expected_delta_dict', DELTA_IGNORE_ORDER_CASES_PARAMS)
+    def test_ignore_order_delta_cases(self, t1, t2, deepdiff_kwargs, to_delta_kwargs, expected_delta_dict):
+        diff = DeepDiff(t1, t2, **deepdiff_kwargs)
+        delta_dict = diff.to_delta_dict(**to_delta_kwargs)
+        assert expected_delta_dict == delta_dict
+        delta = Delta(diff, verify_symmetry=False, raise_errors=True)
+        import pytest; pytest.set_trace()
+        assert t1 + delta == t2