Mercurial > public > mercurial-scm > hg

comparison mercurial/filemerge.py @ 22706:ad25986c4cd3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: introduce :x as short version of internal:x merge tool name "internal:" is so much typing - it is frequently specified on the command line and gives options that are longer than any other I have seen.
author Mads Kiilerich <madski@unity3d.com>
date Sun, 28 Sep 2014 17:15:25 +0200
parents d7f25834ffbb
children 38e0363dcbe0
comparison
equal deleted inserted replaced
22705:d4869b280cd6 22706:ad25986c4cd3
26 '''return a decorator for populating internal merge tool table''' 26 '''return a decorator for populating internal merge tool table'''
27 def decorator(func): 27 def decorator(func):
28 fullname = 'internal:' + name 28 fullname = 'internal:' + name
29 func.__doc__ = "``%s``\n" % fullname + func.__doc__.strip() 29 func.__doc__ = "``%s``\n" % fullname + func.__doc__.strip()
30 internals[fullname] = func 30 internals[fullname] = func
31 internals[':' + name] = func
31 func.trymerge = trymerge 32 func.trymerge = trymerge
32 func.onfailure = onfailure 33 func.onfailure = onfailure
33 return func 34 return func
34 return decorator 35 return decorator
35 36