##// END OF EJS Templates
dispatch: enforce bytes when converting boolean flags to config items...
Augie Fackler -
r31305:dc9842a7 default
parent child Browse files
Show More
@@ -1,920 +1,922 b''
1 # dispatch.py - command dispatching for mercurial
1 # dispatch.py - command dispatching for mercurial
2 #
2 #
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
4 #
4 #
5 # This software may be used and distributed according to the terms of the
5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version.
6 # GNU General Public License version 2 or any later version.
7
7
8 from __future__ import absolute_import, print_function
8 from __future__ import absolute_import, print_function
9
9
10 import atexit
10 import atexit
11 import difflib
11 import difflib
12 import errno
12 import errno
13 import getopt
13 import getopt
14 import os
14 import os
15 import pdb
15 import pdb
16 import re
16 import re
17 import signal
17 import signal
18 import sys
18 import sys
19 import time
19 import time
20 import traceback
20 import traceback
21
21
22
22
23 from .i18n import _
23 from .i18n import _
24
24
25 from . import (
25 from . import (
26 cmdutil,
26 cmdutil,
27 color,
27 color,
28 commands,
28 commands,
29 debugcommands,
29 debugcommands,
30 demandimport,
30 demandimport,
31 encoding,
31 encoding,
32 error,
32 error,
33 extensions,
33 extensions,
34 fancyopts,
34 fancyopts,
35 fileset,
35 fileset,
36 help,
36 help,
37 hg,
37 hg,
38 hook,
38 hook,
39 profiling,
39 profiling,
40 pycompat,
40 pycompat,
41 revset,
41 revset,
42 scmutil,
42 scmutil,
43 templatefilters,
43 templatefilters,
44 templatekw,
44 templatekw,
45 templater,
45 templater,
46 ui as uimod,
46 ui as uimod,
47 util,
47 util,
48 )
48 )
49
49
50 class request(object):
50 class request(object):
51 def __init__(self, args, ui=None, repo=None, fin=None, fout=None,
51 def __init__(self, args, ui=None, repo=None, fin=None, fout=None,
52 ferr=None):
52 ferr=None):
53 self.args = args
53 self.args = args
54 self.ui = ui
54 self.ui = ui
55 self.repo = repo
55 self.repo = repo
56
56
57 # input/output/error streams
57 # input/output/error streams
58 self.fin = fin
58 self.fin = fin
59 self.fout = fout
59 self.fout = fout
60 self.ferr = ferr
60 self.ferr = ferr
61
61
62 def run():
62 def run():
63 "run the command in sys.argv"
63 "run the command in sys.argv"
64 sys.exit((dispatch(request(pycompat.sysargv[1:])) or 0) & 255)
64 sys.exit((dispatch(request(pycompat.sysargv[1:])) or 0) & 255)
65
65
66 def _getsimilar(symbols, value):
66 def _getsimilar(symbols, value):
67 sim = lambda x: difflib.SequenceMatcher(None, value, x).ratio()
67 sim = lambda x: difflib.SequenceMatcher(None, value, x).ratio()
68 # The cutoff for similarity here is pretty arbitrary. It should
68 # The cutoff for similarity here is pretty arbitrary. It should
69 # probably be investigated and tweaked.
69 # probably be investigated and tweaked.
70 return [s for s in symbols if sim(s) > 0.6]
70 return [s for s in symbols if sim(s) > 0.6]
71
71
72 def _reportsimilar(write, similar):
72 def _reportsimilar(write, similar):
73 if len(similar) == 1:
73 if len(similar) == 1:
74 write(_("(did you mean %s?)\n") % similar[0])
74 write(_("(did you mean %s?)\n") % similar[0])
75 elif similar:
75 elif similar:
76 ss = ", ".join(sorted(similar))
76 ss = ", ".join(sorted(similar))
77 write(_("(did you mean one of %s?)\n") % ss)
77 write(_("(did you mean one of %s?)\n") % ss)
78
78
79 def _formatparse(write, inst):
79 def _formatparse(write, inst):
80 similar = []
80 similar = []
81 if isinstance(inst, error.UnknownIdentifier):
81 if isinstance(inst, error.UnknownIdentifier):
82 # make sure to check fileset first, as revset can invoke fileset
82 # make sure to check fileset first, as revset can invoke fileset
83 similar = _getsimilar(inst.symbols, inst.function)
83 similar = _getsimilar(inst.symbols, inst.function)
84 if len(inst.args) > 1:
84 if len(inst.args) > 1:
85 write(_("hg: parse error at %s: %s\n") %
85 write(_("hg: parse error at %s: %s\n") %
86 (inst.args[1], inst.args[0]))
86 (inst.args[1], inst.args[0]))
87 if (inst.args[0][0] == ' '):
87 if (inst.args[0][0] == ' '):
88 write(_("unexpected leading whitespace\n"))
88 write(_("unexpected leading whitespace\n"))
89 else:
89 else:
90 write(_("hg: parse error: %s\n") % inst.args[0])
90 write(_("hg: parse error: %s\n") % inst.args[0])
91 _reportsimilar(write, similar)
91 _reportsimilar(write, similar)
92 if inst.hint:
92 if inst.hint:
93 write(_("(%s)\n") % inst.hint)
93 write(_("(%s)\n") % inst.hint)
94
94
95 def dispatch(req):
95 def dispatch(req):
96 "run the command specified in req.args"
96 "run the command specified in req.args"
97 if req.ferr:
97 if req.ferr:
98 ferr = req.ferr
98 ferr = req.ferr
99 elif req.ui:
99 elif req.ui:
100 ferr = req.ui.ferr
100 ferr = req.ui.ferr
101 else:
101 else:
102 ferr = util.stderr
102 ferr = util.stderr
103
103
104 try:
104 try:
105 if not req.ui:
105 if not req.ui:
106 req.ui = uimod.ui.load()
106 req.ui = uimod.ui.load()
107 if '--traceback' in req.args:
107 if '--traceback' in req.args:
108 req.ui.setconfig('ui', 'traceback', 'on', '--traceback')
108 req.ui.setconfig('ui', 'traceback', 'on', '--traceback')
109
109
110 # set ui streams from the request
110 # set ui streams from the request
111 if req.fin:
111 if req.fin:
112 req.ui.fin = req.fin
112 req.ui.fin = req.fin
113 if req.fout:
113 if req.fout:
114 req.ui.fout = req.fout
114 req.ui.fout = req.fout
115 if req.ferr:
115 if req.ferr:
116 req.ui.ferr = req.ferr
116 req.ui.ferr = req.ferr
117 except error.Abort as inst:
117 except error.Abort as inst:
118 ferr.write(_("abort: %s\n") % inst)
118 ferr.write(_("abort: %s\n") % inst)
119 if inst.hint:
119 if inst.hint:
120 ferr.write(_("(%s)\n") % inst.hint)
120 ferr.write(_("(%s)\n") % inst.hint)
121 return -1
121 return -1
122 except error.ParseError as inst:
122 except error.ParseError as inst:
123 _formatparse(ferr.write, inst)
123 _formatparse(ferr.write, inst)
124 return -1
124 return -1
125
125
126 msg = ' '.join(' ' in a and repr(a) or a for a in req.args)
126 msg = ' '.join(' ' in a and repr(a) or a for a in req.args)
127 starttime = util.timer()
127 starttime = util.timer()
128 ret = None
128 ret = None
129 try:
129 try:
130 ret = _runcatch(req)
130 ret = _runcatch(req)
131 except KeyboardInterrupt:
131 except KeyboardInterrupt:
132 try:
132 try:
133 req.ui.warn(_("interrupted!\n"))
133 req.ui.warn(_("interrupted!\n"))
134 except IOError as inst:
134 except IOError as inst:
135 if inst.errno != errno.EPIPE:
135 if inst.errno != errno.EPIPE:
136 raise
136 raise
137 ret = -1
137 ret = -1
138 finally:
138 finally:
139 duration = util.timer() - starttime
139 duration = util.timer() - starttime
140 req.ui.flush()
140 req.ui.flush()
141 if req.ui.logblockedtimes:
141 if req.ui.logblockedtimes:
142 req.ui._blockedtimes['command_duration'] = duration * 1000
142 req.ui._blockedtimes['command_duration'] = duration * 1000
143 req.ui.log('uiblocked', 'ui blocked ms', **req.ui._blockedtimes)
143 req.ui.log('uiblocked', 'ui blocked ms', **req.ui._blockedtimes)
144 req.ui.log("commandfinish", "%s exited %s after %0.2f seconds\n",
144 req.ui.log("commandfinish", "%s exited %s after %0.2f seconds\n",
145 msg, ret or 0, duration)
145 msg, ret or 0, duration)
146 return ret
146 return ret
147
147
148 def _runcatch(req):
148 def _runcatch(req):
149 def catchterm(*args):
149 def catchterm(*args):
150 raise error.SignalInterrupt
150 raise error.SignalInterrupt
151
151
152 ui = req.ui
152 ui = req.ui
153 try:
153 try:
154 for name in 'SIGBREAK', 'SIGHUP', 'SIGTERM':
154 for name in 'SIGBREAK', 'SIGHUP', 'SIGTERM':
155 num = getattr(signal, name, None)
155 num = getattr(signal, name, None)
156 if num:
156 if num:
157 signal.signal(num, catchterm)
157 signal.signal(num, catchterm)
158 except ValueError:
158 except ValueError:
159 pass # happens if called in a thread
159 pass # happens if called in a thread
160
160
161 def _runcatchfunc():
161 def _runcatchfunc():
162 try:
162 try:
163 debugger = 'pdb'
163 debugger = 'pdb'
164 debugtrace = {
164 debugtrace = {
165 'pdb' : pdb.set_trace
165 'pdb' : pdb.set_trace
166 }
166 }
167 debugmortem = {
167 debugmortem = {
168 'pdb' : pdb.post_mortem
168 'pdb' : pdb.post_mortem
169 }
169 }
170
170
171 # read --config before doing anything else
171 # read --config before doing anything else
172 # (e.g. to change trust settings for reading .hg/hgrc)
172 # (e.g. to change trust settings for reading .hg/hgrc)
173 cfgs = _parseconfig(req.ui, _earlygetopt(['--config'], req.args))
173 cfgs = _parseconfig(req.ui, _earlygetopt(['--config'], req.args))
174
174
175 if req.repo:
175 if req.repo:
176 # copy configs that were passed on the cmdline (--config) to
176 # copy configs that were passed on the cmdline (--config) to
177 # the repo ui
177 # the repo ui
178 for sec, name, val in cfgs:
178 for sec, name, val in cfgs:
179 req.repo.ui.setconfig(sec, name, val, source='--config')
179 req.repo.ui.setconfig(sec, name, val, source='--config')
180
180
181 # developer config: ui.debugger
181 # developer config: ui.debugger
182 debugger = ui.config("ui", "debugger")
182 debugger = ui.config("ui", "debugger")
183 debugmod = pdb
183 debugmod = pdb
184 if not debugger or ui.plain():
184 if not debugger or ui.plain():
185 # if we are in HGPLAIN mode, then disable custom debugging
185 # if we are in HGPLAIN mode, then disable custom debugging
186 debugger = 'pdb'
186 debugger = 'pdb'
187 elif '--debugger' in req.args:
187 elif '--debugger' in req.args:
188 # This import can be slow for fancy debuggers, so only
188 # This import can be slow for fancy debuggers, so only
189 # do it when absolutely necessary, i.e. when actual
189 # do it when absolutely necessary, i.e. when actual
190 # debugging has been requested
190 # debugging has been requested
191 with demandimport.deactivated():
191 with demandimport.deactivated():
192 try:
192 try:
193 debugmod = __import__(debugger)
193 debugmod = __import__(debugger)
194 except ImportError:
194 except ImportError:
195 pass # Leave debugmod = pdb
195 pass # Leave debugmod = pdb
196
196
197 debugtrace[debugger] = debugmod.set_trace
197 debugtrace[debugger] = debugmod.set_trace
198 debugmortem[debugger] = debugmod.post_mortem
198 debugmortem[debugger] = debugmod.post_mortem
199
199
200 # enter the debugger before command execution
200 # enter the debugger before command execution
201 if '--debugger' in req.args:
201 if '--debugger' in req.args:
202 ui.warn(_("entering debugger - "
202 ui.warn(_("entering debugger - "
203 "type c to continue starting hg or h for help\n"))
203 "type c to continue starting hg or h for help\n"))
204
204
205 if (debugger != 'pdb' and
205 if (debugger != 'pdb' and
206 debugtrace[debugger] == debugtrace['pdb']):
206 debugtrace[debugger] == debugtrace['pdb']):
207 ui.warn(_("%s debugger specified "
207 ui.warn(_("%s debugger specified "
208 "but its module was not found\n") % debugger)
208 "but its module was not found\n") % debugger)
209 with demandimport.deactivated():
209 with demandimport.deactivated():
210 debugtrace[debugger]()
210 debugtrace[debugger]()
211 try:
211 try:
212 return _dispatch(req)
212 return _dispatch(req)
213 finally:
213 finally:
214 ui.flush()
214 ui.flush()
215 except: # re-raises
215 except: # re-raises
216 # enter the debugger when we hit an exception
216 # enter the debugger when we hit an exception
217 if '--debugger' in req.args:
217 if '--debugger' in req.args:
218 traceback.print_exc()
218 traceback.print_exc()
219 debugmortem[debugger](sys.exc_info()[2])
219 debugmortem[debugger](sys.exc_info()[2])
220 ui.traceback()
220 ui.traceback()
221 raise
221 raise
222
222
223 return callcatch(ui, _runcatchfunc)
223 return callcatch(ui, _runcatchfunc)
224
224
225 def callcatch(ui, func):
225 def callcatch(ui, func):
226 """like scmutil.callcatch but handles more high-level exceptions about
226 """like scmutil.callcatch but handles more high-level exceptions about
227 config parsing and commands. besides, use handlecommandexception to handle
227 config parsing and commands. besides, use handlecommandexception to handle
228 uncaught exceptions.
228 uncaught exceptions.
229 """
229 """
230 try:
230 try:
231 return scmutil.callcatch(ui, func)
231 return scmutil.callcatch(ui, func)
232 except error.AmbiguousCommand as inst:
232 except error.AmbiguousCommand as inst:
233 ui.warn(_("hg: command '%s' is ambiguous:\n %s\n") %
233 ui.warn(_("hg: command '%s' is ambiguous:\n %s\n") %
234 (inst.args[0], " ".join(inst.args[1])))
234 (inst.args[0], " ".join(inst.args[1])))
235 except error.CommandError as inst:
235 except error.CommandError as inst:
236 if inst.args[0]:
236 if inst.args[0]:
237 ui.pager('help')
237 ui.pager('help')
238 ui.warn(_("hg %s: %s\n") % (inst.args[0], inst.args[1]))
238 ui.warn(_("hg %s: %s\n") % (inst.args[0], inst.args[1]))
239 commands.help_(ui, inst.args[0], full=False, command=True)
239 commands.help_(ui, inst.args[0], full=False, command=True)
240 else:
240 else:
241 ui.pager('help')
241 ui.pager('help')
242 ui.warn(_("hg: %s\n") % inst.args[1])
242 ui.warn(_("hg: %s\n") % inst.args[1])
243 commands.help_(ui, 'shortlist')
243 commands.help_(ui, 'shortlist')
244 except error.ParseError as inst:
244 except error.ParseError as inst:
245 _formatparse(ui.warn, inst)
245 _formatparse(ui.warn, inst)
246 return -1
246 return -1
247 except error.UnknownCommand as inst:
247 except error.UnknownCommand as inst:
248 nocmdmsg = _("hg: unknown command '%s'\n") % inst.args[0]
248 nocmdmsg = _("hg: unknown command '%s'\n") % inst.args[0]
249 try:
249 try:
250 # check if the command is in a disabled extension
250 # check if the command is in a disabled extension
251 # (but don't check for extensions themselves)
251 # (but don't check for extensions themselves)
252 formatted = help.formattedhelp(ui, inst.args[0], unknowncmd=True)
252 formatted = help.formattedhelp(ui, inst.args[0], unknowncmd=True)
253 ui.warn(nocmdmsg)
253 ui.warn(nocmdmsg)
254 ui.write(formatted)
254 ui.write(formatted)
255 except (error.UnknownCommand, error.Abort):
255 except (error.UnknownCommand, error.Abort):
256 suggested = False
256 suggested = False
257 if len(inst.args) == 2:
257 if len(inst.args) == 2:
258 sim = _getsimilar(inst.args[1], inst.args[0])
258 sim = _getsimilar(inst.args[1], inst.args[0])
259 if sim:
259 if sim:
260 ui.warn(nocmdmsg)
260 ui.warn(nocmdmsg)
261 _reportsimilar(ui.warn, sim)
261 _reportsimilar(ui.warn, sim)
262 suggested = True
262 suggested = True
263 if not suggested:
263 if not suggested:
264 ui.pager('help')
264 ui.pager('help')
265 ui.warn(nocmdmsg)
265 ui.warn(nocmdmsg)
266 commands.help_(ui, 'shortlist')
266 commands.help_(ui, 'shortlist')
267 except IOError:
267 except IOError:
268 raise
268 raise
269 except KeyboardInterrupt:
269 except KeyboardInterrupt:
270 raise
270 raise
271 except: # probably re-raises
271 except: # probably re-raises
272 if not handlecommandexception(ui):
272 if not handlecommandexception(ui):
273 raise
273 raise
274
274
275 return -1
275 return -1
276
276
277 def aliasargs(fn, givenargs):
277 def aliasargs(fn, givenargs):
278 args = getattr(fn, 'args', [])
278 args = getattr(fn, 'args', [])
279 if args:
279 if args:
280 cmd = ' '.join(map(util.shellquote, args))
280 cmd = ' '.join(map(util.shellquote, args))
281
281
282 nums = []
282 nums = []
283 def replacer(m):
283 def replacer(m):
284 num = int(m.group(1)) - 1
284 num = int(m.group(1)) - 1
285 nums.append(num)
285 nums.append(num)
286 if num < len(givenargs):
286 if num < len(givenargs):
287 return givenargs[num]
287 return givenargs[num]
288 raise error.Abort(_('too few arguments for command alias'))
288 raise error.Abort(_('too few arguments for command alias'))
289 cmd = re.sub(r'\$(\d+|\$)', replacer, cmd)
289 cmd = re.sub(r'\$(\d+|\$)', replacer, cmd)
290 givenargs = [x for i, x in enumerate(givenargs)
290 givenargs = [x for i, x in enumerate(givenargs)
291 if i not in nums]
291 if i not in nums]
292 args = pycompat.shlexsplit(cmd)
292 args = pycompat.shlexsplit(cmd)
293 return args + givenargs
293 return args + givenargs
294
294
295 def aliasinterpolate(name, args, cmd):
295 def aliasinterpolate(name, args, cmd):
296 '''interpolate args into cmd for shell aliases
296 '''interpolate args into cmd for shell aliases
297
297
298 This also handles $0, $@ and "$@".
298 This also handles $0, $@ and "$@".
299 '''
299 '''
300 # util.interpolate can't deal with "$@" (with quotes) because it's only
300 # util.interpolate can't deal with "$@" (with quotes) because it's only
301 # built to match prefix + patterns.
301 # built to match prefix + patterns.
302 replacemap = dict(('$%d' % (i + 1), arg) for i, arg in enumerate(args))
302 replacemap = dict(('$%d' % (i + 1), arg) for i, arg in enumerate(args))
303 replacemap['$0'] = name
303 replacemap['$0'] = name
304 replacemap['$$'] = '$'
304 replacemap['$$'] = '$'
305 replacemap['$@'] = ' '.join(args)
305 replacemap['$@'] = ' '.join(args)
306 # Typical Unix shells interpolate "$@" (with quotes) as all the positional
306 # Typical Unix shells interpolate "$@" (with quotes) as all the positional
307 # parameters, separated out into words. Emulate the same behavior here by
307 # parameters, separated out into words. Emulate the same behavior here by
308 # quoting the arguments individually. POSIX shells will then typically
308 # quoting the arguments individually. POSIX shells will then typically
309 # tokenize each argument into exactly one word.
309 # tokenize each argument into exactly one word.
310 replacemap['"$@"'] = ' '.join(util.shellquote(arg) for arg in args)
310 replacemap['"$@"'] = ' '.join(util.shellquote(arg) for arg in args)
311 # escape '\$' for regex
311 # escape '\$' for regex
312 regex = '|'.join(replacemap.keys()).replace('$', r'\$')
312 regex = '|'.join(replacemap.keys()).replace('$', r'\$')
313 r = re.compile(regex)
313 r = re.compile(regex)
314 return r.sub(lambda x: replacemap[x.group()], cmd)
314 return r.sub(lambda x: replacemap[x.group()], cmd)
315
315
316 class cmdalias(object):
316 class cmdalias(object):
317 def __init__(self, name, definition, cmdtable, source):
317 def __init__(self, name, definition, cmdtable, source):
318 self.name = self.cmd = name
318 self.name = self.cmd = name
319 self.cmdname = ''
319 self.cmdname = ''
320 self.definition = definition
320 self.definition = definition
321 self.fn = None
321 self.fn = None
322 self.givenargs = []
322 self.givenargs = []
323 self.opts = []
323 self.opts = []
324 self.help = ''
324 self.help = ''
325 self.badalias = None
325 self.badalias = None
326 self.unknowncmd = False
326 self.unknowncmd = False
327 self.source = source
327 self.source = source
328
328
329 try:
329 try:
330 aliases, entry = cmdutil.findcmd(self.name, cmdtable)
330 aliases, entry = cmdutil.findcmd(self.name, cmdtable)
331 for alias, e in cmdtable.iteritems():
331 for alias, e in cmdtable.iteritems():
332 if e is entry:
332 if e is entry:
333 self.cmd = alias
333 self.cmd = alias
334 break
334 break
335 self.shadows = True
335 self.shadows = True
336 except error.UnknownCommand:
336 except error.UnknownCommand:
337 self.shadows = False
337 self.shadows = False
338
338
339 if not self.definition:
339 if not self.definition:
340 self.badalias = _("no definition for alias '%s'") % self.name
340 self.badalias = _("no definition for alias '%s'") % self.name
341 return
341 return
342
342
343 if self.definition.startswith('!'):
343 if self.definition.startswith('!'):
344 self.shell = True
344 self.shell = True
345 def fn(ui, *args):
345 def fn(ui, *args):
346 env = {'HG_ARGS': ' '.join((self.name,) + args)}
346 env = {'HG_ARGS': ' '.join((self.name,) + args)}
347 def _checkvar(m):
347 def _checkvar(m):
348 if m.groups()[0] == '$':
348 if m.groups()[0] == '$':
349 return m.group()
349 return m.group()
350 elif int(m.groups()[0]) <= len(args):
350 elif int(m.groups()[0]) <= len(args):
351 return m.group()
351 return m.group()
352 else:
352 else:
353 ui.debug("No argument found for substitution "
353 ui.debug("No argument found for substitution "
354 "of %i variable in alias '%s' definition."
354 "of %i variable in alias '%s' definition."
355 % (int(m.groups()[0]), self.name))
355 % (int(m.groups()[0]), self.name))
356 return ''
356 return ''
357 cmd = re.sub(r'\$(\d+|\$)', _checkvar, self.definition[1:])
357 cmd = re.sub(r'\$(\d+|\$)', _checkvar, self.definition[1:])
358 cmd = aliasinterpolate(self.name, args, cmd)
358 cmd = aliasinterpolate(self.name, args, cmd)
359 return ui.system(cmd, environ=env,
359 return ui.system(cmd, environ=env,
360 blockedtag='alias_%s' % self.name)
360 blockedtag='alias_%s' % self.name)
361 self.fn = fn
361 self.fn = fn
362 return
362 return
363
363
364 try:
364 try:
365 args = pycompat.shlexsplit(self.definition)
365 args = pycompat.shlexsplit(self.definition)
366 except ValueError as inst:
366 except ValueError as inst:
367 self.badalias = (_("error in definition for alias '%s': %s")
367 self.badalias = (_("error in definition for alias '%s': %s")
368 % (self.name, inst))
368 % (self.name, inst))
369 return
369 return
370 self.cmdname = cmd = args.pop(0)
370 self.cmdname = cmd = args.pop(0)
371 self.givenargs = args
371 self.givenargs = args
372
372
373 for invalidarg in ("--cwd", "-R", "--repository", "--repo", "--config"):
373 for invalidarg in ("--cwd", "-R", "--repository", "--repo", "--config"):
374 if _earlygetopt([invalidarg], args):
374 if _earlygetopt([invalidarg], args):
375 self.badalias = (_("error in definition for alias '%s': %s may "
375 self.badalias = (_("error in definition for alias '%s': %s may "
376 "only be given on the command line")
376 "only be given on the command line")
377 % (self.name, invalidarg))
377 % (self.name, invalidarg))
378 return
378 return
379
379
380 try:
380 try:
381 tableentry = cmdutil.findcmd(cmd, cmdtable, False)[1]
381 tableentry = cmdutil.findcmd(cmd, cmdtable, False)[1]
382 if len(tableentry) > 2:
382 if len(tableentry) > 2:
383 self.fn, self.opts, self.help = tableentry
383 self.fn, self.opts, self.help = tableentry
384 else:
384 else:
385 self.fn, self.opts = tableentry
385 self.fn, self.opts = tableentry
386
386
387 if self.help.startswith("hg " + cmd):
387 if self.help.startswith("hg " + cmd):
388 # drop prefix in old-style help lines so hg shows the alias
388 # drop prefix in old-style help lines so hg shows the alias
389 self.help = self.help[4 + len(cmd):]
389 self.help = self.help[4 + len(cmd):]
390 self.__doc__ = self.fn.__doc__
390 self.__doc__ = self.fn.__doc__
391
391
392 except error.UnknownCommand:
392 except error.UnknownCommand:
393 self.badalias = (_("alias '%s' resolves to unknown command '%s'")
393 self.badalias = (_("alias '%s' resolves to unknown command '%s'")
394 % (self.name, cmd))
394 % (self.name, cmd))
395 self.unknowncmd = True
395 self.unknowncmd = True
396 except error.AmbiguousCommand:
396 except error.AmbiguousCommand:
397 self.badalias = (_("alias '%s' resolves to ambiguous command '%s'")
397 self.badalias = (_("alias '%s' resolves to ambiguous command '%s'")
398 % (self.name, cmd))
398 % (self.name, cmd))
399
399
400 @property
400 @property
401 def args(self):
401 def args(self):
402 args = map(util.expandpath, self.givenargs)
402 args = map(util.expandpath, self.givenargs)
403 return aliasargs(self.fn, args)
403 return aliasargs(self.fn, args)
404
404
405 def __getattr__(self, name):
405 def __getattr__(self, name):
406 adefaults = {'norepo': True, 'optionalrepo': False, 'inferrepo': False}
406 adefaults = {'norepo': True, 'optionalrepo': False, 'inferrepo': False}
407 if name not in adefaults:
407 if name not in adefaults:
408 raise AttributeError(name)
408 raise AttributeError(name)
409 if self.badalias or util.safehasattr(self, 'shell'):
409 if self.badalias or util.safehasattr(self, 'shell'):
410 return adefaults[name]
410 return adefaults[name]
411 return getattr(self.fn, name)
411 return getattr(self.fn, name)
412
412
413 def __call__(self, ui, *args, **opts):
413 def __call__(self, ui, *args, **opts):
414 if self.badalias:
414 if self.badalias:
415 hint = None
415 hint = None
416 if self.unknowncmd:
416 if self.unknowncmd:
417 try:
417 try:
418 # check if the command is in a disabled extension
418 # check if the command is in a disabled extension
419 cmd, ext = extensions.disabledcmd(ui, self.cmdname)[:2]
419 cmd, ext = extensions.disabledcmd(ui, self.cmdname)[:2]
420 hint = _("'%s' is provided by '%s' extension") % (cmd, ext)
420 hint = _("'%s' is provided by '%s' extension") % (cmd, ext)
421 except error.UnknownCommand:
421 except error.UnknownCommand:
422 pass
422 pass
423 raise error.Abort(self.badalias, hint=hint)
423 raise error.Abort(self.badalias, hint=hint)
424 if self.shadows:
424 if self.shadows:
425 ui.debug("alias '%s' shadows command '%s'\n" %
425 ui.debug("alias '%s' shadows command '%s'\n" %
426 (self.name, self.cmdname))
426 (self.name, self.cmdname))
427
427
428 ui.log('commandalias', "alias '%s' expands to '%s'\n",
428 ui.log('commandalias', "alias '%s' expands to '%s'\n",
429 self.name, self.definition)
429 self.name, self.definition)
430 if util.safehasattr(self, 'shell'):
430 if util.safehasattr(self, 'shell'):
431 return self.fn(ui, *args, **opts)
431 return self.fn(ui, *args, **opts)
432 else:
432 else:
433 try:
433 try:
434 return util.checksignature(self.fn)(ui, *args, **opts)
434 return util.checksignature(self.fn)(ui, *args, **opts)
435 except error.SignatureError:
435 except error.SignatureError:
436 args = ' '.join([self.cmdname] + self.args)
436 args = ' '.join([self.cmdname] + self.args)
437 ui.debug("alias '%s' expands to '%s'\n" % (self.name, args))
437 ui.debug("alias '%s' expands to '%s'\n" % (self.name, args))
438 raise
438 raise
439
439
440 def addaliases(ui, cmdtable):
440 def addaliases(ui, cmdtable):
441 # aliases are processed after extensions have been loaded, so they
441 # aliases are processed after extensions have been loaded, so they
442 # may use extension commands. Aliases can also use other alias definitions,
442 # may use extension commands. Aliases can also use other alias definitions,
443 # but only if they have been defined prior to the current definition.
443 # but only if they have been defined prior to the current definition.
444 for alias, definition in ui.configitems('alias'):
444 for alias, definition in ui.configitems('alias'):
445 source = ui.configsource('alias', alias)
445 source = ui.configsource('alias', alias)
446 aliasdef = cmdalias(alias, definition, cmdtable, source)
446 aliasdef = cmdalias(alias, definition, cmdtable, source)
447
447
448 try:
448 try:
449 olddef = cmdtable[aliasdef.cmd][0]
449 olddef = cmdtable[aliasdef.cmd][0]
450 if olddef.definition == aliasdef.definition:
450 if olddef.definition == aliasdef.definition:
451 continue
451 continue
452 except (KeyError, AttributeError):
452 except (KeyError, AttributeError):
453 # definition might not exist or it might not be a cmdalias
453 # definition might not exist or it might not be a cmdalias
454 pass
454 pass
455
455
456 cmdtable[aliasdef.name] = (aliasdef, aliasdef.opts, aliasdef.help)
456 cmdtable[aliasdef.name] = (aliasdef, aliasdef.opts, aliasdef.help)
457
457
458 def _parse(ui, args):
458 def _parse(ui, args):
459 options = {}
459 options = {}
460 cmdoptions = {}
460 cmdoptions = {}
461
461
462 try:
462 try:
463 args = fancyopts.fancyopts(args, commands.globalopts, options)
463 args = fancyopts.fancyopts(args, commands.globalopts, options)
464 except getopt.GetoptError as inst:
464 except getopt.GetoptError as inst:
465 raise error.CommandError(None, inst)
465 raise error.CommandError(None, inst)
466
466
467 if args:
467 if args:
468 cmd, args = args[0], args[1:]
468 cmd, args = args[0], args[1:]
469 aliases, entry = cmdutil.findcmd(cmd, commands.table,
469 aliases, entry = cmdutil.findcmd(cmd, commands.table,
470 ui.configbool("ui", "strict"))
470 ui.configbool("ui", "strict"))
471 cmd = aliases[0]
471 cmd = aliases[0]
472 args = aliasargs(entry[0], args)
472 args = aliasargs(entry[0], args)
473 defaults = ui.config("defaults", cmd)
473 defaults = ui.config("defaults", cmd)
474 if defaults:
474 if defaults:
475 args = map(util.expandpath, pycompat.shlexsplit(defaults)) + args
475 args = map(util.expandpath, pycompat.shlexsplit(defaults)) + args
476 c = list(entry[1])
476 c = list(entry[1])
477 else:
477 else:
478 cmd = None
478 cmd = None
479 c = []
479 c = []
480
480
481 # combine global options into local
481 # combine global options into local
482 for o in commands.globalopts:
482 for o in commands.globalopts:
483 c.append((o[0], o[1], options[o[1]], o[3]))
483 c.append((o[0], o[1], options[o[1]], o[3]))
484
484
485 try:
485 try:
486 args = fancyopts.fancyopts(args, c, cmdoptions, gnu=True)
486 args = fancyopts.fancyopts(args, c, cmdoptions, gnu=True)
487 except getopt.GetoptError as inst:
487 except getopt.GetoptError as inst:
488 raise error.CommandError(cmd, inst)
488 raise error.CommandError(cmd, inst)
489
489
490 # separate global options back out
490 # separate global options back out
491 for o in commands.globalopts:
491 for o in commands.globalopts:
492 n = o[1]
492 n = o[1]
493 options[n] = cmdoptions[n]
493 options[n] = cmdoptions[n]
494 del cmdoptions[n]
494 del cmdoptions[n]
495
495
496 return (cmd, cmd and entry[0] or None, args, options, cmdoptions)
496 return (cmd, cmd and entry[0] or None, args, options, cmdoptions)
497
497
498 def _parseconfig(ui, config):
498 def _parseconfig(ui, config):
499 """parse the --config options from the command line"""
499 """parse the --config options from the command line"""
500 configs = []
500 configs = []
501
501
502 for cfg in config:
502 for cfg in config:
503 try:
503 try:
504 name, value = [cfgelem.strip()
504 name, value = [cfgelem.strip()
505 for cfgelem in cfg.split('=', 1)]
505 for cfgelem in cfg.split('=', 1)]
506 section, name = name.split('.', 1)
506 section, name = name.split('.', 1)
507 if not section or not name:
507 if not section or not name:
508 raise IndexError
508 raise IndexError
509 ui.setconfig(section, name, value, '--config')
509 ui.setconfig(section, name, value, '--config')
510 configs.append((section, name, value))
510 configs.append((section, name, value))
511 except (IndexError, ValueError):
511 except (IndexError, ValueError):
512 raise error.Abort(_('malformed --config option: %r '
512 raise error.Abort(_('malformed --config option: %r '
513 '(use --config section.name=value)') % cfg)
513 '(use --config section.name=value)') % cfg)
514
514
515 return configs
515 return configs
516
516
517 def _earlygetopt(aliases, args):
517 def _earlygetopt(aliases, args):
518 """Return list of values for an option (or aliases).
518 """Return list of values for an option (or aliases).
519
519
520 The values are listed in the order they appear in args.
520 The values are listed in the order they appear in args.
521 The options and values are removed from args.
521 The options and values are removed from args.
522
522
523 >>> args = ['x', '--cwd', 'foo', 'y']
523 >>> args = ['x', '--cwd', 'foo', 'y']
524 >>> _earlygetopt(['--cwd'], args), args
524 >>> _earlygetopt(['--cwd'], args), args
525 (['foo'], ['x', 'y'])
525 (['foo'], ['x', 'y'])
526
526
527 >>> args = ['x', '--cwd=bar', 'y']
527 >>> args = ['x', '--cwd=bar', 'y']
528 >>> _earlygetopt(['--cwd'], args), args
528 >>> _earlygetopt(['--cwd'], args), args
529 (['bar'], ['x', 'y'])
529 (['bar'], ['x', 'y'])
530
530
531 >>> args = ['x', '-R', 'foo', 'y']
531 >>> args = ['x', '-R', 'foo', 'y']
532 >>> _earlygetopt(['-R'], args), args
532 >>> _earlygetopt(['-R'], args), args
533 (['foo'], ['x', 'y'])
533 (['foo'], ['x', 'y'])
534
534
535 >>> args = ['x', '-Rbar', 'y']
535 >>> args = ['x', '-Rbar', 'y']
536 >>> _earlygetopt(['-R'], args), args
536 >>> _earlygetopt(['-R'], args), args
537 (['bar'], ['x', 'y'])
537 (['bar'], ['x', 'y'])
538 """
538 """
539 try:
539 try:
540 argcount = args.index("--")
540 argcount = args.index("--")
541 except ValueError:
541 except ValueError:
542 argcount = len(args)
542 argcount = len(args)
543 shortopts = [opt for opt in aliases if len(opt) == 2]
543 shortopts = [opt for opt in aliases if len(opt) == 2]
544 values = []
544 values = []
545 pos = 0
545 pos = 0
546 while pos < argcount:
546 while pos < argcount:
547 fullarg = arg = args[pos]
547 fullarg = arg = args[pos]
548 equals = arg.find('=')
548 equals = arg.find('=')
549 if equals > -1:
549 if equals > -1:
550 arg = arg[:equals]
550 arg = arg[:equals]
551 if arg in aliases:
551 if arg in aliases:
552 del args[pos]
552 del args[pos]
553 if equals > -1:
553 if equals > -1:
554 values.append(fullarg[equals + 1:])
554 values.append(fullarg[equals + 1:])
555 argcount -= 1
555 argcount -= 1
556 else:
556 else:
557 if pos + 1 >= argcount:
557 if pos + 1 >= argcount:
558 # ignore and let getopt report an error if there is no value
558 # ignore and let getopt report an error if there is no value
559 break
559 break
560 values.append(args.pop(pos))
560 values.append(args.pop(pos))
561 argcount -= 2
561 argcount -= 2
562 elif arg[:2] in shortopts:
562 elif arg[:2] in shortopts:
563 # short option can have no following space, e.g. hg log -Rfoo
563 # short option can have no following space, e.g. hg log -Rfoo
564 values.append(args.pop(pos)[2:])
564 values.append(args.pop(pos)[2:])
565 argcount -= 1
565 argcount -= 1
566 else:
566 else:
567 pos += 1
567 pos += 1
568 return values
568 return values
569
569
570 def runcommand(lui, repo, cmd, fullargs, ui, options, d, cmdpats, cmdoptions):
570 def runcommand(lui, repo, cmd, fullargs, ui, options, d, cmdpats, cmdoptions):
571 # run pre-hook, and abort if it fails
571 # run pre-hook, and abort if it fails
572 hook.hook(lui, repo, "pre-%s" % cmd, True, args=" ".join(fullargs),
572 hook.hook(lui, repo, "pre-%s" % cmd, True, args=" ".join(fullargs),
573 pats=cmdpats, opts=cmdoptions)
573 pats=cmdpats, opts=cmdoptions)
574 try:
574 try:
575 ret = _runcommand(ui, options, cmd, d)
575 ret = _runcommand(ui, options, cmd, d)
576 # run post-hook, passing command result
576 # run post-hook, passing command result
577 hook.hook(lui, repo, "post-%s" % cmd, False, args=" ".join(fullargs),
577 hook.hook(lui, repo, "post-%s" % cmd, False, args=" ".join(fullargs),
578 result=ret, pats=cmdpats, opts=cmdoptions)
578 result=ret, pats=cmdpats, opts=cmdoptions)
579 except Exception:
579 except Exception:
580 # run failure hook and re-raise
580 # run failure hook and re-raise
581 hook.hook(lui, repo, "fail-%s" % cmd, False, args=" ".join(fullargs),
581 hook.hook(lui, repo, "fail-%s" % cmd, False, args=" ".join(fullargs),
582 pats=cmdpats, opts=cmdoptions)
582 pats=cmdpats, opts=cmdoptions)
583 raise
583 raise
584 return ret
584 return ret
585
585
586 def _getlocal(ui, rpath, wd=None):
586 def _getlocal(ui, rpath, wd=None):
587 """Return (path, local ui object) for the given target path.
587 """Return (path, local ui object) for the given target path.
588
588
589 Takes paths in [cwd]/.hg/hgrc into account."
589 Takes paths in [cwd]/.hg/hgrc into account."
590 """
590 """
591 if wd is None:
591 if wd is None:
592 try:
592 try:
593 wd = pycompat.getcwd()
593 wd = pycompat.getcwd()
594 except OSError as e:
594 except OSError as e:
595 raise error.Abort(_("error getting current working directory: %s") %
595 raise error.Abort(_("error getting current working directory: %s") %
596 e.strerror)
596 e.strerror)
597 path = cmdutil.findrepo(wd) or ""
597 path = cmdutil.findrepo(wd) or ""
598 if not path:
598 if not path:
599 lui = ui
599 lui = ui
600 else:
600 else:
601 lui = ui.copy()
601 lui = ui.copy()
602 lui.readconfig(os.path.join(path, ".hg", "hgrc"), path)
602 lui.readconfig(os.path.join(path, ".hg", "hgrc"), path)
603
603
604 if rpath and rpath[-1]:
604 if rpath and rpath[-1]:
605 path = lui.expandpath(rpath[-1])
605 path = lui.expandpath(rpath[-1])
606 lui = ui.copy()
606 lui = ui.copy()
607 lui.readconfig(os.path.join(path, ".hg", "hgrc"), path)
607 lui.readconfig(os.path.join(path, ".hg", "hgrc"), path)
608
608
609 return path, lui
609 return path, lui
610
610
611 def _checkshellalias(lui, ui, args):
611 def _checkshellalias(lui, ui, args):
612 """Return the function to run the shell alias, if it is required"""
612 """Return the function to run the shell alias, if it is required"""
613 options = {}
613 options = {}
614
614
615 try:
615 try:
616 args = fancyopts.fancyopts(args, commands.globalopts, options)
616 args = fancyopts.fancyopts(args, commands.globalopts, options)
617 except getopt.GetoptError:
617 except getopt.GetoptError:
618 return
618 return
619
619
620 if not args:
620 if not args:
621 return
621 return
622
622
623 cmdtable = commands.table
623 cmdtable = commands.table
624
624
625 cmd = args[0]
625 cmd = args[0]
626 try:
626 try:
627 strict = ui.configbool("ui", "strict")
627 strict = ui.configbool("ui", "strict")
628 aliases, entry = cmdutil.findcmd(cmd, cmdtable, strict)
628 aliases, entry = cmdutil.findcmd(cmd, cmdtable, strict)
629 except (error.AmbiguousCommand, error.UnknownCommand):
629 except (error.AmbiguousCommand, error.UnknownCommand):
630 return
630 return
631
631
632 cmd = aliases[0]
632 cmd = aliases[0]
633 fn = entry[0]
633 fn = entry[0]
634
634
635 if cmd and util.safehasattr(fn, 'shell'):
635 if cmd and util.safehasattr(fn, 'shell'):
636 d = lambda: fn(ui, *args[1:])
636 d = lambda: fn(ui, *args[1:])
637 return lambda: runcommand(lui, None, cmd, args[:1], ui, options, d,
637 return lambda: runcommand(lui, None, cmd, args[:1], ui, options, d,
638 [], {})
638 [], {})
639
639
640 _loaded = set()
640 _loaded = set()
641
641
642 # list of (objname, loadermod, loadername) tuple:
642 # list of (objname, loadermod, loadername) tuple:
643 # - objname is the name of an object in extension module, from which
643 # - objname is the name of an object in extension module, from which
644 # extra information is loaded
644 # extra information is loaded
645 # - loadermod is the module where loader is placed
645 # - loadermod is the module where loader is placed
646 # - loadername is the name of the function, which takes (ui, extensionname,
646 # - loadername is the name of the function, which takes (ui, extensionname,
647 # extraobj) arguments
647 # extraobj) arguments
648 extraloaders = [
648 extraloaders = [
649 ('cmdtable', commands, 'loadcmdtable'),
649 ('cmdtable', commands, 'loadcmdtable'),
650 ('colortable', color, 'loadcolortable'),
650 ('colortable', color, 'loadcolortable'),
651 ('filesetpredicate', fileset, 'loadpredicate'),
651 ('filesetpredicate', fileset, 'loadpredicate'),
652 ('revsetpredicate', revset, 'loadpredicate'),
652 ('revsetpredicate', revset, 'loadpredicate'),
653 ('templatefilter', templatefilters, 'loadfilter'),
653 ('templatefilter', templatefilters, 'loadfilter'),
654 ('templatefunc', templater, 'loadfunction'),
654 ('templatefunc', templater, 'loadfunction'),
655 ('templatekeyword', templatekw, 'loadkeyword'),
655 ('templatekeyword', templatekw, 'loadkeyword'),
656 ]
656 ]
657
657
658 def _dispatch(req):
658 def _dispatch(req):
659 args = req.args
659 args = req.args
660 ui = req.ui
660 ui = req.ui
661
661
662 # check for cwd
662 # check for cwd
663 cwd = _earlygetopt(['--cwd'], args)
663 cwd = _earlygetopt(['--cwd'], args)
664 if cwd:
664 if cwd:
665 os.chdir(cwd[-1])
665 os.chdir(cwd[-1])
666
666
667 rpath = _earlygetopt(["-R", "--repository", "--repo"], args)
667 rpath = _earlygetopt(["-R", "--repository", "--repo"], args)
668 path, lui = _getlocal(ui, rpath)
668 path, lui = _getlocal(ui, rpath)
669
669
670 # Side-effect of accessing is debugcommands module is guaranteed to be
670 # Side-effect of accessing is debugcommands module is guaranteed to be
671 # imported and commands.table is populated.
671 # imported and commands.table is populated.
672 debugcommands.command
672 debugcommands.command
673
673
674 uis = set([ui, lui])
674 uis = set([ui, lui])
675
675
676 if req.repo:
676 if req.repo:
677 uis.add(req.repo.ui)
677 uis.add(req.repo.ui)
678
678
679 if '--profile' in args:
679 if '--profile' in args:
680 for ui_ in uis:
680 for ui_ in uis:
681 ui_.setconfig('profiling', 'enabled', 'true', '--profile')
681 ui_.setconfig('profiling', 'enabled', 'true', '--profile')
682
682
683 with profiling.maybeprofile(lui):
683 with profiling.maybeprofile(lui):
684 # Configure extensions in phases: uisetup, extsetup, cmdtable, and
684 # Configure extensions in phases: uisetup, extsetup, cmdtable, and
685 # reposetup. Programs like TortoiseHg will call _dispatch several
685 # reposetup. Programs like TortoiseHg will call _dispatch several
686 # times so we keep track of configured extensions in _loaded.
686 # times so we keep track of configured extensions in _loaded.
687 extensions.loadall(lui)
687 extensions.loadall(lui)
688 exts = [ext for ext in extensions.extensions() if ext[0] not in _loaded]
688 exts = [ext for ext in extensions.extensions() if ext[0] not in _loaded]
689 # Propagate any changes to lui.__class__ by extensions
689 # Propagate any changes to lui.__class__ by extensions
690 ui.__class__ = lui.__class__
690 ui.__class__ = lui.__class__
691
691
692 # (uisetup and extsetup are handled in extensions.loadall)
692 # (uisetup and extsetup are handled in extensions.loadall)
693
693
694 for name, module in exts:
694 for name, module in exts:
695 for objname, loadermod, loadername in extraloaders:
695 for objname, loadermod, loadername in extraloaders:
696 extraobj = getattr(module, objname, None)
696 extraobj = getattr(module, objname, None)
697 if extraobj is not None:
697 if extraobj is not None:
698 getattr(loadermod, loadername)(ui, name, extraobj)
698 getattr(loadermod, loadername)(ui, name, extraobj)
699 _loaded.add(name)
699 _loaded.add(name)
700
700
701 # (reposetup is handled in hg.repository)
701 # (reposetup is handled in hg.repository)
702
702
703 addaliases(lui, commands.table)
703 addaliases(lui, commands.table)
704
704
705 # All aliases and commands are completely defined, now.
705 # All aliases and commands are completely defined, now.
706 # Check abbreviation/ambiguity of shell alias.
706 # Check abbreviation/ambiguity of shell alias.
707 shellaliasfn = _checkshellalias(lui, ui, args)
707 shellaliasfn = _checkshellalias(lui, ui, args)
708 if shellaliasfn:
708 if shellaliasfn:
709 return shellaliasfn()
709 return shellaliasfn()
710
710
711 # check for fallback encoding
711 # check for fallback encoding
712 fallback = lui.config('ui', 'fallbackencoding')
712 fallback = lui.config('ui', 'fallbackencoding')
713 if fallback:
713 if fallback:
714 encoding.fallbackencoding = fallback
714 encoding.fallbackencoding = fallback
715
715
716 fullargs = args
716 fullargs = args
717 cmd, func, args, options, cmdoptions = _parse(lui, args)
717 cmd, func, args, options, cmdoptions = _parse(lui, args)
718
718
719 if options["config"]:
719 if options["config"]:
720 raise error.Abort(_("option --config may not be abbreviated!"))
720 raise error.Abort(_("option --config may not be abbreviated!"))
721 if options["cwd"]:
721 if options["cwd"]:
722 raise error.Abort(_("option --cwd may not be abbreviated!"))
722 raise error.Abort(_("option --cwd may not be abbreviated!"))
723 if options["repository"]:
723 if options["repository"]:
724 raise error.Abort(_(
724 raise error.Abort(_(
725 "option -R has to be separated from other options (e.g. not "
725 "option -R has to be separated from other options (e.g. not "
726 "-qR) and --repository may only be abbreviated as --repo!"))
726 "-qR) and --repository may only be abbreviated as --repo!"))
727
727
728 if options["encoding"]:
728 if options["encoding"]:
729 encoding.encoding = options["encoding"]
729 encoding.encoding = options["encoding"]
730 if options["encodingmode"]:
730 if options["encodingmode"]:
731 encoding.encodingmode = options["encodingmode"]
731 encoding.encodingmode = options["encodingmode"]
732 if options["time"]:
732 if options["time"]:
733 def get_times():
733 def get_times():
734 t = os.times()
734 t = os.times()
735 if t[4] == 0.0:
735 if t[4] == 0.0:
736 # Windows leaves this as zero, so use time.clock()
736 # Windows leaves this as zero, so use time.clock()
737 t = (t[0], t[1], t[2], t[3], time.clock())
737 t = (t[0], t[1], t[2], t[3], time.clock())
738 return t
738 return t
739 s = get_times()
739 s = get_times()
740 def print_time():
740 def print_time():
741 t = get_times()
741 t = get_times()
742 ui.warn(
742 ui.warn(
743 _("time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n") %
743 _("time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n") %
744 (t[4]-s[4], t[0]-s[0], t[2]-s[2], t[1]-s[1], t[3]-s[3]))
744 (t[4]-s[4], t[0]-s[0], t[2]-s[2], t[1]-s[1], t[3]-s[3]))
745 atexit.register(print_time)
745 atexit.register(print_time)
746
746
747 if options['verbose'] or options['debug'] or options['quiet']:
747 if options['verbose'] or options['debug'] or options['quiet']:
748 for opt in ('verbose', 'debug', 'quiet'):
748 for opt in ('verbose', 'debug', 'quiet'):
749 val = str(bool(options[opt]))
749 val = str(bool(options[opt]))
750 if pycompat.ispy3:
751 val = val.encode('ascii')
750 for ui_ in uis:
752 for ui_ in uis:
751 ui_.setconfig('ui', opt, val, '--' + opt)
753 ui_.setconfig('ui', opt, val, '--' + opt)
752
754
753 if options['traceback']:
755 if options['traceback']:
754 for ui_ in uis:
756 for ui_ in uis:
755 ui_.setconfig('ui', 'traceback', 'on', '--traceback')
757 ui_.setconfig('ui', 'traceback', 'on', '--traceback')
756
758
757 if options['noninteractive']:
759 if options['noninteractive']:
758 for ui_ in uis:
760 for ui_ in uis:
759 ui_.setconfig('ui', 'interactive', 'off', '-y')
761 ui_.setconfig('ui', 'interactive', 'off', '-y')
760
762
761 if util.parsebool(options['pager']):
763 if util.parsebool(options['pager']):
762 ui.pager('internal-always-' + cmd)
764 ui.pager('internal-always-' + cmd)
763 elif options['pager'] != 'auto':
765 elif options['pager'] != 'auto':
764 ui.disablepager()
766 ui.disablepager()
765
767
766 if cmdoptions.get('insecure', False):
768 if cmdoptions.get('insecure', False):
767 for ui_ in uis:
769 for ui_ in uis:
768 ui_.insecureconnections = True
770 ui_.insecureconnections = True
769
771
770 # setup color handling
772 # setup color handling
771 coloropt = options['color']
773 coloropt = options['color']
772 for ui_ in uis:
774 for ui_ in uis:
773 if coloropt:
775 if coloropt:
774 ui_.setconfig('ui', 'color', coloropt, '--color')
776 ui_.setconfig('ui', 'color', coloropt, '--color')
775 color.setup(ui_)
777 color.setup(ui_)
776
778
777 if options['version']:
779 if options['version']:
778 return commands.version_(ui)
780 return commands.version_(ui)
779 if options['help']:
781 if options['help']:
780 return commands.help_(ui, cmd, command=cmd is not None)
782 return commands.help_(ui, cmd, command=cmd is not None)
781 elif not cmd:
783 elif not cmd:
782 return commands.help_(ui, 'shortlist')
784 return commands.help_(ui, 'shortlist')
783
785
784 repo = None
786 repo = None
785 cmdpats = args[:]
787 cmdpats = args[:]
786 if not func.norepo:
788 if not func.norepo:
787 # use the repo from the request only if we don't have -R
789 # use the repo from the request only if we don't have -R
788 if not rpath and not cwd:
790 if not rpath and not cwd:
789 repo = req.repo
791 repo = req.repo
790
792
791 if repo:
793 if repo:
792 # set the descriptors of the repo ui to those of ui
794 # set the descriptors of the repo ui to those of ui
793 repo.ui.fin = ui.fin
795 repo.ui.fin = ui.fin
794 repo.ui.fout = ui.fout
796 repo.ui.fout = ui.fout
795 repo.ui.ferr = ui.ferr
797 repo.ui.ferr = ui.ferr
796 else:
798 else:
797 try:
799 try:
798 repo = hg.repository(ui, path=path)
800 repo = hg.repository(ui, path=path)
799 if not repo.local():
801 if not repo.local():
800 raise error.Abort(_("repository '%s' is not local")
802 raise error.Abort(_("repository '%s' is not local")
801 % path)
803 % path)
802 repo.ui.setconfig("bundle", "mainreporoot", repo.root,
804 repo.ui.setconfig("bundle", "mainreporoot", repo.root,
803 'repo')
805 'repo')
804 except error.RequirementError:
806 except error.RequirementError:
805 raise
807 raise
806 except error.RepoError:
808 except error.RepoError:
807 if rpath and rpath[-1]: # invalid -R path
809 if rpath and rpath[-1]: # invalid -R path
808 raise
810 raise
809 if not func.optionalrepo:
811 if not func.optionalrepo:
810 if func.inferrepo and args and not path:
812 if func.inferrepo and args and not path:
811 # try to infer -R from command args
813 # try to infer -R from command args
812 repos = map(cmdutil.findrepo, args)
814 repos = map(cmdutil.findrepo, args)
813 guess = repos[0]
815 guess = repos[0]
814 if guess and repos.count(guess) == len(repos):
816 if guess and repos.count(guess) == len(repos):
815 req.args = ['--repository', guess] + fullargs
817 req.args = ['--repository', guess] + fullargs
816 return _dispatch(req)
818 return _dispatch(req)
817 if not path:
819 if not path:
818 raise error.RepoError(_("no repository found in"
820 raise error.RepoError(_("no repository found in"
819 " '%s' (.hg not found)")
821 " '%s' (.hg not found)")
820 % pycompat.getcwd())
822 % pycompat.getcwd())
821 raise
823 raise
822 if repo:
824 if repo:
823 ui = repo.ui
825 ui = repo.ui
824 if options['hidden']:
826 if options['hidden']:
825 repo = repo.unfiltered()
827 repo = repo.unfiltered()
826 args.insert(0, repo)
828 args.insert(0, repo)
827 elif rpath:
829 elif rpath:
828 ui.warn(_("warning: --repository ignored\n"))
830 ui.warn(_("warning: --repository ignored\n"))
829
831
830 msg = ' '.join(' ' in a and repr(a) or a for a in fullargs)
832 msg = ' '.join(' ' in a and repr(a) or a for a in fullargs)
831 ui.log("command", '%s\n', msg)
833 ui.log("command", '%s\n', msg)
832 strcmdopt = pycompat.strkwargs(cmdoptions)
834 strcmdopt = pycompat.strkwargs(cmdoptions)
833 d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
835 d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
834 try:
836 try:
835 return runcommand(lui, repo, cmd, fullargs, ui, options, d,
837 return runcommand(lui, repo, cmd, fullargs, ui, options, d,
836 cmdpats, cmdoptions)
838 cmdpats, cmdoptions)
837 finally:
839 finally:
838 if repo and repo != req.repo:
840 if repo and repo != req.repo:
839 repo.close()
841 repo.close()
840
842
841 def _runcommand(ui, options, cmd, cmdfunc):
843 def _runcommand(ui, options, cmd, cmdfunc):
842 """Run a command function, possibly with profiling enabled."""
844 """Run a command function, possibly with profiling enabled."""
843 try:
845 try:
844 return cmdfunc()
846 return cmdfunc()
845 except error.SignatureError:
847 except error.SignatureError:
846 raise error.CommandError(cmd, _('invalid arguments'))
848 raise error.CommandError(cmd, _('invalid arguments'))
847
849
848 def _exceptionwarning(ui):
850 def _exceptionwarning(ui):
849 """Produce a warning message for the current active exception"""
851 """Produce a warning message for the current active exception"""
850
852
851 # For compatibility checking, we discard the portion of the hg
853 # For compatibility checking, we discard the portion of the hg
852 # version after the + on the assumption that if a "normal
854 # version after the + on the assumption that if a "normal
853 # user" is running a build with a + in it the packager
855 # user" is running a build with a + in it the packager
854 # probably built from fairly close to a tag and anyone with a
856 # probably built from fairly close to a tag and anyone with a
855 # 'make local' copy of hg (where the version number can be out
857 # 'make local' copy of hg (where the version number can be out
856 # of date) will be clueful enough to notice the implausible
858 # of date) will be clueful enough to notice the implausible
857 # version number and try updating.
859 # version number and try updating.
858 ct = util.versiontuple(n=2)
860 ct = util.versiontuple(n=2)
859 worst = None, ct, ''
861 worst = None, ct, ''
860 if ui.config('ui', 'supportcontact', None) is None:
862 if ui.config('ui', 'supportcontact', None) is None:
861 for name, mod in extensions.extensions():
863 for name, mod in extensions.extensions():
862 testedwith = getattr(mod, 'testedwith', '')
864 testedwith = getattr(mod, 'testedwith', '')
863 if pycompat.ispy3 and isinstance(testedwith, str):
865 if pycompat.ispy3 and isinstance(testedwith, str):
864 testedwith = testedwith.encode(u'utf-8')
866 testedwith = testedwith.encode(u'utf-8')
865 report = getattr(mod, 'buglink', _('the extension author.'))
867 report = getattr(mod, 'buglink', _('the extension author.'))
866 if not testedwith.strip():
868 if not testedwith.strip():
867 # We found an untested extension. It's likely the culprit.
869 # We found an untested extension. It's likely the culprit.
868 worst = name, 'unknown', report
870 worst = name, 'unknown', report
869 break
871 break
870
872
871 # Never blame on extensions bundled with Mercurial.
873 # Never blame on extensions bundled with Mercurial.
872 if extensions.ismoduleinternal(mod):
874 if extensions.ismoduleinternal(mod):
873 continue
875 continue
874
876
875 tested = [util.versiontuple(t, 2) for t in testedwith.split()]
877 tested = [util.versiontuple(t, 2) for t in testedwith.split()]
876 if ct in tested:
878 if ct in tested:
877 continue
879 continue
878
880
879 lower = [t for t in tested if t < ct]
881 lower = [t for t in tested if t < ct]
880 nearest = max(lower or tested)
882 nearest = max(lower or tested)
881 if worst[0] is None or nearest < worst[1]:
883 if worst[0] is None or nearest < worst[1]:
882 worst = name, nearest, report
884 worst = name, nearest, report
883 if worst[0] is not None:
885 if worst[0] is not None:
884 name, testedwith, report = worst
886 name, testedwith, report = worst
885 if not isinstance(testedwith, (bytes, str)):
887 if not isinstance(testedwith, (bytes, str)):
886 testedwith = '.'.join([str(c) for c in testedwith])
888 testedwith = '.'.join([str(c) for c in testedwith])
887 warning = (_('** Unknown exception encountered with '
889 warning = (_('** Unknown exception encountered with '
888 'possibly-broken third-party extension %s\n'
890 'possibly-broken third-party extension %s\n'
889 '** which supports versions %s of Mercurial.\n'
891 '** which supports versions %s of Mercurial.\n'
890 '** Please disable %s and try your action again.\n'
892 '** Please disable %s and try your action again.\n'
891 '** If that fixes the bug please report it to %s\n')
893 '** If that fixes the bug please report it to %s\n')
892 % (name, testedwith, name, report))
894 % (name, testedwith, name, report))
893 else:
895 else:
894 bugtracker = ui.config('ui', 'supportcontact', None)
896 bugtracker = ui.config('ui', 'supportcontact', None)
895 if bugtracker is None:
897 if bugtracker is None:
896 bugtracker = _("https://mercurial-scm.org/wiki/BugTracker")
898 bugtracker = _("https://mercurial-scm.org/wiki/BugTracker")
897 warning = (_("** unknown exception encountered, "
899 warning = (_("** unknown exception encountered, "
898 "please report by visiting\n** ") + bugtracker + '\n')
900 "please report by visiting\n** ") + bugtracker + '\n')
899 if pycompat.ispy3:
901 if pycompat.ispy3:
900 sysversion = sys.version.encode(u'utf-8')
902 sysversion = sys.version.encode(u'utf-8')
901 else:
903 else:
902 sysversion = sys.version
904 sysversion = sys.version
903 sysversion = sysversion.replace('\n', '')
905 sysversion = sysversion.replace('\n', '')
904 warning += ((_("** Python %s\n") % sysversion) +
906 warning += ((_("** Python %s\n") % sysversion) +
905 (_("** Mercurial Distributed SCM (version %s)\n") %
907 (_("** Mercurial Distributed SCM (version %s)\n") %
906 util.version()) +
908 util.version()) +
907 (_("** Extensions loaded: %s\n") %
909 (_("** Extensions loaded: %s\n") %
908 ", ".join([x[0] for x in extensions.extensions()])))
910 ", ".join([x[0] for x in extensions.extensions()])))
909 return warning
911 return warning
910
912
911 def handlecommandexception(ui):
913 def handlecommandexception(ui):
912 """Produce a warning message for broken commands
914 """Produce a warning message for broken commands
913
915
914 Called when handling an exception; the exception is reraised if
916 Called when handling an exception; the exception is reraised if
915 this function returns False, ignored otherwise.
917 this function returns False, ignored otherwise.
916 """
918 """
917 warning = _exceptionwarning(ui)
919 warning = _exceptionwarning(ui)
918 ui.log("commandexception", "%s\n%s\n", warning, traceback.format_exc())
920 ui.log("commandexception", "%s\n%s\n", warning, traceback.format_exc())
919 ui.warn(warning)
921 ui.warn(warning)
920 return False # re-raise the exception
922 return False # re-raise the exception
General Comments 0
You need to be logged in to leave comments. Login now