Mercurial > hg > mercurial-crew

diff mercurial/util.py @ 22643:3b1c0e1ede4c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
util: fix sorteddict.pop When using `.pop` on such object the list was not cleared of the popped key, leading to crash.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Thu, 02 Oct 2014 12:39:37 -0500
parents 0d0350cfc7ab
children bb7a911b138e
line wrap: on
line diff
--- a/mercurial/util.py
+++ b/mercurial/util.py
@@ -252,6 +252,12 @@
     def __delitem__(self, key):
         dict.__delitem__(self, key)
         self._list.remove(key)
+    def pop(self, key, *args, **kwargs):
+        dict.pop(self, key, *args, **kwargs)
+        try:
+            self._list.remove(key)
+        except ValueError:
+            pass
     def keys(self):
         return self._list
     def iterkeys(self):