--- a/contrib/dirstatenonnormalcheck.py Thu Oct 05 11:34:41 2017 -0700
+++ b/contrib/dirstatenonnormalcheck.py Thu Oct 05 11:34:41 2017 -0700
@@ -32,9 +32,10 @@
def _checkdirstate(orig, self, arg):
"""Check nonnormal set consistency before and after the call to orig"""
- checkconsistency(self._ui, orig, self._map, self._nonnormalset, "before")
+ checkconsistency(self._ui, orig, self._map, self._map.nonnormalset,
+ "before")
r = orig(self, arg)
- checkconsistency(self._ui, orig, self._map, self._nonnormalset, "after")
+ checkconsistency(self._ui, orig, self._map, self._map.nonnormalset, "after")
return r
def extsetup(ui):