comparison mercurial/dispatch.py @ 20829:9a09a625bc93

merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 25 Mar 2014 16:17:16 -0500
parents 131f7fe06e9e dd2e25e49862
children 5e13507a3b4e
comparison
equal deleted inserted replaced
20828:3210b7930899 20829:9a09a625bc93
106 for sec, name, val in cfgs: 106 for sec, name, val in cfgs:
107 req.repo.ui.setconfig(sec, name, val, source='--config') 107 req.repo.ui.setconfig(sec, name, val, source='--config')
108 108
109 # if we are in HGPLAIN mode, then disable custom debugging 109 # if we are in HGPLAIN mode, then disable custom debugging
110 debugger = ui.config("ui", "debugger") 110 debugger = ui.config("ui", "debugger")
111 debugmod = pdb
111 if not debugger or ui.plain(): 112 if not debugger or ui.plain():
112 debugger = 'pdb' 113 debugger = 'pdb'
113 114 elif '--debugger' in req.args:
114 try: 115 # This import can be slow for fancy debuggers, so only
115 debugmod = __import__(debugger) 116 # do it when absolutely necessary, i.e. when actual
116 except ImportError: 117 # debugging has been requested
117 debugmod = pdb 118 try:
119 debugmod = __import__(debugger)
120 except ImportError:
121 pass # Leave debugmod = pdb
118 122
119 debugtrace[debugger] = debugmod.set_trace 123 debugtrace[debugger] = debugmod.set_trace
120 debugmortem[debugger] = debugmod.post_mortem 124 debugmortem[debugger] = debugmod.post_mortem
121 125
122 # enter the debugger before command execution 126 # enter the debugger before command execution