Patchwork [3,of,3] exthelper: switch to using the registrar merging method

login
register
mail settings
Submitter Matt Harbison
Date Dec. 31, 2018, 3:55 a.m.
Message ID <d6805464fb325b5c362c.1546228509@Envy>
Download mbox | patch
Permalink /patch/37402/
State Accepted
Headers show

Comments

Matt Harbison - Dec. 31, 2018, 3:55 a.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1546228014 18000
#      Sun Dec 30 22:46:54 2018 -0500
# Node ID d6805464fb325b5c362ce33d1cebfaefca84e976
# Parent  94d4ffb62049c77f4631ae76732765b17033d2dd
exthelper: switch to using the registrar merging method

Patch

diff --git a/mercurial/exthelper.py b/mercurial/exthelper.py
--- a/mercurial/exthelper.py
+++ b/mercurial/exthelper.py
@@ -96,9 +96,9 @@  class exthelper(object):
         self._uipopulatecallables.extend(other._uipopulatecallables)
         self._extcallables.extend(other._extcallables)
         self._repocallables.extend(other._repocallables)
-        self.filesetpredicate._table.update(other.filesetpredicate._table)
-        self.revsetpredicate._table.update(other.revsetpredicate._table)
-        self.templatekeyword._table.update(other.templatekeyword._table)
+        self.filesetpredicate._merge(other.filesetpredicate)
+        self.revsetpredicate._merge(other.revsetpredicate)
+        self.templatekeyword._merge(other.templatekeyword)
         self._commandwrappers.extend(other._commandwrappers)
         self._extcommandwrappers.extend(other._extcommandwrappers)
         self._functionwrappers.extend(other._functionwrappers)