Mercurial > hg
diff mercurial/extensions.py @ 33699: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 |
line wrap: on
line diff
--- a/mercurial/extensions.py Sat Aug 05 05:25:36 2017 +0530 +++ b/mercurial/extensions.py Sun Aug 06 01:13:57 2017 +0900 @@ -250,6 +250,7 @@ from . import ( color, commands, + filemerge, fileset, revset, templatefilters, @@ -268,6 +269,7 @@ ('colortable', color, 'loadcolortable'), ('configtable', configitems, 'loadconfigtable'), ('filesetpredicate', fileset, 'loadpredicate'), + ('internalmerge', filemerge, 'loadinternalmerge'), ('revsetpredicate', revset, 'loadpredicate'), ('templatefilter', templatefilters, 'loadfilter'), ('templatefunc', templater, 'loadfunction'),