Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
registrar: minor cleanup to the merge function
authorMatt Harbison <matt_harbison@yahoo.com>
Wed, 02 Jan 2019 21:49:40 -0500
changeset 41096 f8f61cf246f5
parent 41095 e0d00ec2d614
child 41097 6a63ba61e71f
registrar: minor cleanup to the merge function Pointed out by Yuya.
mercurial/registrar.py file | annotate | diff | comparison | revisions 
--- a/mercurial/registrar.py	Wed Jan 02 10:31:14 2019 +0100
+++ b/mercurial/registrar.py	Wed Jan 02 21:49:40 2019 -0500
@@ -80,11 +80,11 @@
         current one, or a ProgrammmingError is raised.  Additionally, the types
         of the two registrars must match.
         """
-        if type(self) != type(registrarbase):
+        if not isinstance(registrarbase, type(self)):
             msg = "cannot merge different types of registrar"
             raise error.ProgrammingError(msg)
 
-        dups = set(registrarbase._table.keys()).intersection(self._table.keys())
+        dups = set(registrarbase._table).intersection(self._table)
 
         if dups:
             msg = 'duplicate registration for names: "%s"' % '", "'.join(dups)
Mercurial