equal
deleted
inserted
replaced
12 |
12 |
13 from . import ( |
13 from . import ( |
14 commands, |
14 commands, |
15 error, |
15 error, |
16 extensions, |
16 extensions, |
17 pycompat, |
|
18 registrar, |
17 registrar, |
19 ) |
18 ) |
20 |
19 |
21 from hgdemandimport import tracing |
20 from hgdemandimport import tracing |
22 |
21 |
112 self.templatekeyword._merge(other.templatekeyword) |
111 self.templatekeyword._merge(other.templatekeyword) |
113 self._commandwrappers.extend(other._commandwrappers) |
112 self._commandwrappers.extend(other._commandwrappers) |
114 self._extcommandwrappers.extend(other._extcommandwrappers) |
113 self._extcommandwrappers.extend(other._extcommandwrappers) |
115 self._functionwrappers.extend(other._functionwrappers) |
114 self._functionwrappers.extend(other._functionwrappers) |
116 self.cmdtable.update(other.cmdtable) |
115 self.cmdtable.update(other.cmdtable) |
117 for section, items in pycompat.iteritems(other.configtable): |
116 for section, items in other.configtable.items(): |
118 if section in self.configtable: |
117 if section in self.configtable: |
119 self.configtable[section].update(items) |
118 self.configtable[section].update(items) |
120 else: |
119 else: |
121 self.configtable[section] = items |
120 self.configtable[section] = items |
122 |
121 |