--- a/mercurial/exthelper.py Sun Dec 23 23:01:51 2018 -0500
+++ b/mercurial/exthelper.py Thu Dec 27 21:26:17 2018 -0500
@@ -40,12 +40,14 @@
self.command = registrar.command(self.cmdtable)
self.configtable = {}
self.configitem = registrar.configitem(self.configtable)
+ self.revsetpredicate = registrar.revsetpredicate()
def merge(self, other):
self._uicallables.extend(other._uicallables)
self._uipopulatecallables.extend(other._uipopulatecallables)
self._extcallables.extend(other._extcallables)
self._repocallables.extend(other._repocallables)
+ self.revsetpredicate._table.update(other.revsetpredicate._table)
self._commandwrappers.extend(other._commandwrappers)
self._extcommandwrappers.extend(other._extcommandwrappers)
self._functionwrappers.extend(other._functionwrappers)