diff tests/test-dicthelpers.py @ 18894:ed46c2b98b0d

dicthelpers.diff: compare against default for missing values

This is not only a bit faster, but also aligns with callers' expectations
better since we can legitimately have manifestdict's _flags set to '' instead
of unset.

hg perfmergecalculate -r .
before: ! wall 0.139582 comb 0.140000 user 0.140000 sys 0.000000 (best of 59)
after:  ! wall 0.126154 comb 0.120000 user 0.120000 sys 0.000000 (best of 74)

hg perfmergecalculate -r .^
before: ! wall 0.236333 comb 0.240000 user 0.240000 sys 0.000000 (best of 36)
after:  ! wall 0.212265 comb 0.210000 user 0.210000 sys 0.000000 (best of 45)

--- a/tests/test-dicthelpers.py	Tue Apr 09 09:40:40 2013 -0700
+++ b/tests/test-dicthelpers.py	Wed Apr 10 12:31:07 2013 -0700
@@ -49,5 +49,11 @@
                                              'c': ('baz', 456),
                                              'd': (456, 'quux')})
 
+        # check that we compare against default
+        self.assertEqual(diff(d1, d2, 'baz'), {'a': ('foo', 'foo2'),
+                                               'd': ('baz', 'quux')})
+        self.assertEqual(diff(d1, d2, 'quux'), {'a': ('foo', 'foo2'),
+                                                'c': ('baz', 'quux')})
+
 if __name__ == '__main__':
     silenttestrunner.main(__name__)