[Updated] D10275: util: fix the signature for the pypy override of sortdict.update()

mharbison72 (Matt Harbison) phabricator at mercurial-scm.org
Sun Apr 11 23:25:36 UTC 2021


Closed by commit rHG64400d05db1e: util: fix the signature for the pypy override of sortdict.update() (authored by mharbison72).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D10275?vs=26605&id=26812

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D10275/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D10275

AFFECTED FILES
  mercurial/util.py

CHANGE DETAILS

diff --git a/mercurial/util.py b/mercurial/util.py
--- a/mercurial/util.py
+++ b/mercurial/util.py
@@ -1296,11 +1296,13 @@
 
     if pycompat.ispypy:
         # __setitem__() isn't called as of PyPy 5.8.0
-        def update(self, src):
+        def update(self, src, **f):
             if isinstance(src, dict):
                 src = pycompat.iteritems(src)
             for k, v in src:
                 self[k] = v
+            for k in f:
+                self[k] = f[k]
 
     def insert(self, position, key, value):
         for (i, (k, v)) in enumerate(list(self.items())):



To: mharbison72, #hg-reviewers, Alphare, pulkit
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20210411/3d93411a/attachment-0002.html>


More information about the Mercurial-patches mailing list