39 self.cmdtable = {} |
39 self.cmdtable = {} |
40 self.command = registrar.command(self.cmdtable) |
40 self.command = registrar.command(self.cmdtable) |
41 self.configtable = {} |
41 self.configtable = {} |
42 self.configitem = registrar.configitem(self.configtable) |
42 self.configitem = registrar.configitem(self.configtable) |
43 self.revsetpredicate = registrar.revsetpredicate() |
43 self.revsetpredicate = registrar.revsetpredicate() |
|
44 self.templatekeyword = registrar.templatekeyword() |
44 |
45 |
45 def merge(self, other): |
46 def merge(self, other): |
46 self._uicallables.extend(other._uicallables) |
47 self._uicallables.extend(other._uicallables) |
47 self._uipopulatecallables.extend(other._uipopulatecallables) |
48 self._uipopulatecallables.extend(other._uipopulatecallables) |
48 self._extcallables.extend(other._extcallables) |
49 self._extcallables.extend(other._extcallables) |
49 self._repocallables.extend(other._repocallables) |
50 self._repocallables.extend(other._repocallables) |
50 self.revsetpredicate._table.update(other.revsetpredicate._table) |
51 self.revsetpredicate._table.update(other.revsetpredicate._table) |
|
52 self.templatekeyword._table.update(other.templatekeyword._table) |
51 self._commandwrappers.extend(other._commandwrappers) |
53 self._commandwrappers.extend(other._commandwrappers) |
52 self._extcommandwrappers.extend(other._extcommandwrappers) |
54 self._extcommandwrappers.extend(other._extcommandwrappers) |
53 self._functionwrappers.extend(other._functionwrappers) |
55 self._functionwrappers.extend(other._functionwrappers) |
54 self._duckpunchers.extend(other._duckpunchers) |
56 self._duckpunchers.extend(other._duckpunchers) |
55 self.cmdtable.update(other.cmdtable) |
57 self.cmdtable.update(other.cmdtable) |