94 def merge(self, other): |
94 def merge(self, other): |
95 self._uicallables.extend(other._uicallables) |
95 self._uicallables.extend(other._uicallables) |
96 self._uipopulatecallables.extend(other._uipopulatecallables) |
96 self._uipopulatecallables.extend(other._uipopulatecallables) |
97 self._extcallables.extend(other._extcallables) |
97 self._extcallables.extend(other._extcallables) |
98 self._repocallables.extend(other._repocallables) |
98 self._repocallables.extend(other._repocallables) |
99 self.filesetpredicate._table.update(other.filesetpredicate._table) |
99 self.filesetpredicate._merge(other.filesetpredicate) |
100 self.revsetpredicate._table.update(other.revsetpredicate._table) |
100 self.revsetpredicate._merge(other.revsetpredicate) |
101 self.templatekeyword._table.update(other.templatekeyword._table) |
101 self.templatekeyword._merge(other.templatekeyword) |
102 self._commandwrappers.extend(other._commandwrappers) |
102 self._commandwrappers.extend(other._commandwrappers) |
103 self._extcommandwrappers.extend(other._extcommandwrappers) |
103 self._extcommandwrappers.extend(other._extcommandwrappers) |
104 self._functionwrappers.extend(other._functionwrappers) |
104 self._functionwrappers.extend(other._functionwrappers) |
105 self._duckpunchers.extend(other._duckpunchers) |
105 self._duckpunchers.extend(other._duckpunchers) |
106 self.cmdtable.update(other.cmdtable) |
106 self.cmdtable.update(other.cmdtable) |