comparison mercurial/dispatch.py @ 34087:5361771f9714

wrapfunction: use functools.partial if possible Every `extensions.bind` call inserts a frame in traceback: ... in closure return func(*(args + a), **kw) which makes traceback noisy. The Python stdlib has a `functools.partial` which is backed by C code and does not pollute traceback. However it does not support instancemethod and sets `args` attribute which could be problematic for alias handling. This patch makes `wrapfunction` use `functools.partial` if we are wrapping a function directly exported by a module (so it's impossible to be a class or instance method), and special handles `wrapfunction` results so alias handling code could handle `args` just fine. As an example, `hg rebase -s . -d . --traceback` got 6 lines removed in my setup: File "hg/mercurial/dispatch.py", line 898, in _dispatch cmdpats, cmdoptions) -File "hg/mercurial/extensions.py", line 333, in closure - return func(*(args + a), **kw) File "hg/hgext/journal.py", line 84, in runcommand return orig(lui, repo, cmd, fullargs, *args) -File "hg/mercurial/extensions.py", line 333, in closure - return func(*(args + a), **kw) File "fb-hgext/hgext3rd/fbamend/hiddenoverride.py", line 119, in runcommand result = orig(lui, repo, cmd, fullargs, *args) File "hg/mercurial/dispatch.py", line 660, in runcommand ret = _runcommand(ui, options, cmd, d) -File "hg/mercurial/extensions.py", line 333, in closure - return func(*(args + a), **kw) File "hg/hgext/pager.py", line 69, in pagecmd return orig(ui, options, cmd, cmdfunc) .... Differential Revision: https://phab.mercurial-scm.org/D632
author Jun Wu <quark@fb.com>
date Tue, 05 Sep 2017 13:37:36 -0700
parents d5b2beca16c0
children 0fa781320203
comparison
equal deleted inserted replaced
34086:a39dce4a76b8 34087:5361771f9714
355 raise 355 raise
356 356
357 return -1 357 return -1
358 358
359 def aliasargs(fn, givenargs): 359 def aliasargs(fn, givenargs):
360 args = getattr(fn, 'args', []) 360 args = []
361 # only care about alias 'args', ignore 'args' set by extensions.wrapfunction
362 if not util.safehasattr(fn, '_origfunc'):
363 args = getattr(fn, 'args', args)
361 if args: 364 if args:
362 cmd = ' '.join(map(util.shellquote, args)) 365 cmd = ' '.join(map(util.shellquote, args))
363 366
364 nums = [] 367 nums = []
365 def replacer(m): 368 def replacer(m):