equal
deleted
inserted
replaced
17 |
17 |
18 from . import ( |
18 from . import ( |
19 error, |
19 error, |
20 formatter, |
20 formatter, |
21 match, |
21 match, |
|
22 pycompat, |
22 scmutil, |
23 scmutil, |
23 simplemerge, |
24 simplemerge, |
24 tagmerge, |
25 tagmerge, |
25 templatekw, |
26 templatekw, |
26 templater, |
27 templater, |
91 |
92 |
92 def internaltool(name, mergetype, onfailure=None, precheck=None): |
93 def internaltool(name, mergetype, onfailure=None, precheck=None): |
93 '''return a decorator for populating internal merge tool table''' |
94 '''return a decorator for populating internal merge tool table''' |
94 def decorator(func): |
95 def decorator(func): |
95 fullname = ':' + name |
96 fullname = ':' + name |
96 func.__doc__ = "``%s``\n" % fullname + func.__doc__.strip() |
97 func.__doc__ = (pycompat.sysstr("``%s``\n" % fullname) |
|
98 + func.__doc__.strip()) |
97 internals[fullname] = func |
99 internals[fullname] = func |
98 internals['internal:' + name] = func |
100 internals['internal:' + name] = func |
99 internalsdoc[fullname] = func |
101 internalsdoc[fullname] = func |
100 func.mergetype = mergetype |
102 func.mergetype = mergetype |
101 func.onfailure = onfailure |
103 func.onfailure = onfailure |