comparison mercurial/extensions.py @ 33725:50c44dee741a

filemerge: move decorator definition for internal merge tools to registrar This patch also adds extra loading entry for internal merge tools to extensions.py, for similarity to other decorators defined in registrar.py. This patch uses "internalmerge" for decorator class name, instead of original "internaltool", because the latter is too generic. BTW, after this patch, 4-spaces indentation is added to the 1st line of internal merge tool description docstring, and this may make already translated entries in *.po fuzzy. Even though this indentation is required for "definition list" in reST syntax, absence of it has been overlooked, because help.makeitemsdoc() forcibly inserts it at generation of online help. But this forcible insertion causes formatting issue (I'll send another patch series for this). Therefore, this additional indentation should be reasonable.
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Sun, 06 Aug 2017 01:13:57 +0900
parents 1d5e497c08b3
children 62fbe95075d3
comparison
equal deleted inserted replaced
33724:3748098d072a 33725:50c44dee741a
248 248
249 # delay importing avoids cyclic dependency (especially commands) 249 # delay importing avoids cyclic dependency (especially commands)
250 from . import ( 250 from . import (
251 color, 251 color,
252 commands, 252 commands,
253 filemerge,
253 fileset, 254 fileset,
254 revset, 255 revset,
255 templatefilters, 256 templatefilters,
256 templatekw, 257 templatekw,
257 templater, 258 templater,
266 extraloaders = [ 267 extraloaders = [
267 ('cmdtable', commands, 'loadcmdtable'), 268 ('cmdtable', commands, 'loadcmdtable'),
268 ('colortable', color, 'loadcolortable'), 269 ('colortable', color, 'loadcolortable'),
269 ('configtable', configitems, 'loadconfigtable'), 270 ('configtable', configitems, 'loadconfigtable'),
270 ('filesetpredicate', fileset, 'loadpredicate'), 271 ('filesetpredicate', fileset, 'loadpredicate'),
272 ('internalmerge', filemerge, 'loadinternalmerge'),
271 ('revsetpredicate', revset, 'loadpredicate'), 273 ('revsetpredicate', revset, 'loadpredicate'),
272 ('templatefilter', templatefilters, 'loadfilter'), 274 ('templatefilter', templatefilters, 'loadfilter'),
273 ('templatefunc', templater, 'loadfunction'), 275 ('templatefunc', templater, 'loadfunction'),
274 ('templatekeyword', templatekw, 'loadkeyword'), 276 ('templatekeyword', templatekw, 'loadkeyword'),
275 ] 277 ]