mercurial-scm/hg-stable: mercurial/dispatch.py annotate

annotate mercurial/dispatch.py @ 29132:12769703d4ba

dispatch: always load extensions before running shell aliases (issue5230) Before this patch, we may or may not load extensions for shell aliases depending on whether the command is abbreviated or not. Loading extensions may have useful side effects to shell aliases. For example, the pager extension does not work for shell aliases. This patch removes the code checking shell aliases before loading extensions to give the user a more consistent experience. It may hurt performance for shell aliases a bit without chg but the correctness seems worth it. It will also make the behavior consistent with chg since chg will always load all extensions before running commands.

author	Jun Wu <quark@fb.com>
date	Sat, 07 May 2016 14:12:23 +0100
parents	e6dfb0e4eeef
children	39149b6036e6

rev	line source
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	1 # dispatch.py - command dispatching for mercurial
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	2 #
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	4 #
8225 46293a0c7e9f updated license to be explicit about GPL version 2 Martin Geisler <mg@lazybytes.net> parents: 8206 diff changeset	5 # This software may be used and distributed according to the terms of the
10263 25e572394f5c Update license to GPLv2+ Matt Mackall <mpm@selenic.com> parents: 9993 diff changeset	6 # GNU General Public License version 2 or any later version.
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	7
27615 4030d3b79953 dispatch: use print function Gregory Szorc <gregory.szorc@gmail.com> parents: 27516 diff changeset	8 from __future__ import absolute_import, print_function
25932 d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	9
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	10 import atexit
24221 4e240d6ab898 dispatch: offer near-edit-distance suggestions for {file,rev}set functions Augie Fackler <augie@google.com> parents: 24163 diff changeset	11 import difflib
25932 d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	12 import errno
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	13 import os
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	14 import pdb
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	15 import re
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	16 import shlex
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	17 import signal
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	18 import socket
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	19 import sys
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	20 import time
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	21 import traceback
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	22
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	23
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	24 from .i18n import _
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	25
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	26 from . import (
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	27 cmdutil,
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	28 commands,
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	29 demandimport,
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	30 encoding,
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	31 error,
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	32 extensions,
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	33 fancyopts,
28447 4eb5496c2bd4 registrar: add filesetpredicate to mark a function as fileset predicate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28394 diff changeset	34 fileset,
25932 d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	35 hg,
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	36 hook,
28394 dcb4209bd30d revset: replace extpredicate by revsetpredicate of registrar FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28391 diff changeset	37 revset,
28692 6b3b958daf03 registrar: add templatefilter to mark a function as template filter (API) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28623 diff changeset	38 templatefilters,
28538 009f58f1ea75 registrar: add templatekeyword to mark a function as template keyword (API) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28534 diff changeset	39 templatekw,
28695 cc103bd0dbf9 registrar: add templatefunc to mark a function as template function (API) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28692 diff changeset	40 templater,
25932 d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	41 ui as uimod,
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	42 util,
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	43 )
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	44
14438 08bfec2ef031 dispatch: wrap dispatch related information in a request class Idan Kamara <idankk86@gmail.com> parents: 14286 diff changeset	45 class request(object):
16683 525fdb738975 cleanup: eradicate long lines Brodie Rao <brodie@sf.io> parents: 16609 diff changeset	46 def __init__(self, args, ui=None, repo=None, fin=None, fout=None,
525fdb738975 cleanup: eradicate long lines Brodie Rao <brodie@sf.io> parents: 16609 diff changeset	47 ferr=None):
14438 08bfec2ef031 dispatch: wrap dispatch related information in a request class Idan Kamara <idankk86@gmail.com> parents: 14286 diff changeset	48 self.args = args
14439 80c599eee3f3 dispatch: use the request to store the ui object Idan Kamara <idankk86@gmail.com> parents: 14438 diff changeset	49 self.ui = ui
14510 eccbb9980ada dispatch: add repo to the request Idan Kamara <idankk86@gmail.com> parents: 14439 diff changeset	50 self.repo = repo
14438 08bfec2ef031 dispatch: wrap dispatch related information in a request class Idan Kamara <idankk86@gmail.com> parents: 14286 diff changeset	51
14613 ea8938d3a5aa dispatch: add I/O descriptors to the request Idan Kamara <idankk86@gmail.com> parents: 14601 diff changeset	52 # input/output/error streams
ea8938d3a5aa dispatch: add I/O descriptors to the request Idan Kamara <idankk86@gmail.com> parents: 14601 diff changeset	53 self.fin = fin
ea8938d3a5aa dispatch: add I/O descriptors to the request Idan Kamara <idankk86@gmail.com> parents: 14601 diff changeset	54 self.fout = fout
ea8938d3a5aa dispatch: add I/O descriptors to the request Idan Kamara <idankk86@gmail.com> parents: 14601 diff changeset	55 self.ferr = ferr
ea8938d3a5aa dispatch: add I/O descriptors to the request Idan Kamara <idankk86@gmail.com> parents: 14601 diff changeset	56
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	57 def run():
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	58 "run the command in sys.argv"
15439 01611e7c36ff dispatch: exit with 8-bit exit code Mads Kiilerich <mads@kiilerich.com> parents: 15233 diff changeset	59 sys.exit((dispatch(request(sys.argv[1:])) or 0) & 255)
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	60
24221 4e240d6ab898 dispatch: offer near-edit-distance suggestions for {file,rev}set functions Augie Fackler <augie@google.com> parents: 24163 diff changeset	61 def _getsimilar(symbols, value):
4e240d6ab898 dispatch: offer near-edit-distance suggestions for {file,rev}set functions Augie Fackler <augie@google.com> parents: 24163 diff changeset	62 sim = lambda x: difflib.SequenceMatcher(None, value, x).ratio()
4e240d6ab898 dispatch: offer near-edit-distance suggestions for {file,rev}set functions Augie Fackler <augie@google.com> parents: 24163 diff changeset	63 # The cutoff for similarity here is pretty arbitrary. It should
4e240d6ab898 dispatch: offer near-edit-distance suggestions for {file,rev}set functions Augie Fackler <augie@google.com> parents: 24163 diff changeset	64 # probably be investigated and tweaked.
4e240d6ab898 dispatch: offer near-edit-distance suggestions for {file,rev}set functions Augie Fackler <augie@google.com> parents: 24163 diff changeset	65 return [s for s in symbols if sim(s) > 0.6]
4e240d6ab898 dispatch: offer near-edit-distance suggestions for {file,rev}set functions Augie Fackler <augie@google.com> parents: 24163 diff changeset	66
27623 b3376fba4ab9 dispatch: report similar names consistently Bryan O'Sullivan <bos@serpentine.com> parents: 27615 diff changeset	67 def _reportsimilar(write, similar):
b3376fba4ab9 dispatch: report similar names consistently Bryan O'Sullivan <bos@serpentine.com> parents: 27615 diff changeset	68 if len(similar) == 1:
b3376fba4ab9 dispatch: report similar names consistently Bryan O'Sullivan <bos@serpentine.com> parents: 27615 diff changeset	69 write(_("(did you mean %s?)\n") % similar[0])
b3376fba4ab9 dispatch: report similar names consistently Bryan O'Sullivan <bos@serpentine.com> parents: 27615 diff changeset	70 elif similar:
b3376fba4ab9 dispatch: report similar names consistently Bryan O'Sullivan <bos@serpentine.com> parents: 27615 diff changeset	71 ss = ", ".join(sorted(similar))
b3376fba4ab9 dispatch: report similar names consistently Bryan O'Sullivan <bos@serpentine.com> parents: 27615 diff changeset	72 write(_("(did you mean one of %s?)\n") % ss)
b3376fba4ab9 dispatch: report similar names consistently Bryan O'Sullivan <bos@serpentine.com> parents: 27615 diff changeset	73
24039 2ee35b6ee4fb dispatch: consolidate formatting of ParseErrors Augie Fackler <augie@google.com> parents: 23871 diff changeset	74 def _formatparse(write, inst):
24221 4e240d6ab898 dispatch: offer near-edit-distance suggestions for {file,rev}set functions Augie Fackler <augie@google.com> parents: 24163 diff changeset	75 similar = []
4e240d6ab898 dispatch: offer near-edit-distance suggestions for {file,rev}set functions Augie Fackler <augie@google.com> parents: 24163 diff changeset	76 if isinstance(inst, error.UnknownIdentifier):
4e240d6ab898 dispatch: offer near-edit-distance suggestions for {file,rev}set functions Augie Fackler <augie@google.com> parents: 24163 diff changeset	77 # make sure to check fileset first, as revset can invoke fileset
4e240d6ab898 dispatch: offer near-edit-distance suggestions for {file,rev}set functions Augie Fackler <augie@google.com> parents: 24163 diff changeset	78 similar = _getsimilar(inst.symbols, inst.function)
24039 2ee35b6ee4fb dispatch: consolidate formatting of ParseErrors Augie Fackler <augie@google.com> parents: 23871 diff changeset	79 if len(inst.args) > 1:
2ee35b6ee4fb dispatch: consolidate formatting of ParseErrors Augie Fackler <augie@google.com> parents: 23871 diff changeset	80 write(_("hg: parse error at %s: %s\n") %
2ee35b6ee4fb dispatch: consolidate formatting of ParseErrors Augie Fackler <augie@google.com> parents: 23871 diff changeset	81 (inst.args[1], inst.args[0]))
2ee35b6ee4fb dispatch: consolidate formatting of ParseErrors Augie Fackler <augie@google.com> parents: 23871 diff changeset	82 if (inst.args[0][0] == ' '):
2ee35b6ee4fb dispatch: consolidate formatting of ParseErrors Augie Fackler <augie@google.com> parents: 23871 diff changeset	83 write(_("unexpected leading whitespace\n"))
2ee35b6ee4fb dispatch: consolidate formatting of ParseErrors Augie Fackler <augie@google.com> parents: 23871 diff changeset	84 else:
2ee35b6ee4fb dispatch: consolidate formatting of ParseErrors Augie Fackler <augie@google.com> parents: 23871 diff changeset	85 write(_("hg: parse error: %s\n") % inst.args[0])
27623 b3376fba4ab9 dispatch: report similar names consistently Bryan O'Sullivan <bos@serpentine.com> parents: 27615 diff changeset	86 _reportsimilar(write, similar)
28515 491eabd0df79 dispatch: extract common logic for handling ParseError Jun Wu <quark@fb.com> parents: 28447 diff changeset	87 if inst.hint:
491eabd0df79 dispatch: extract common logic for handling ParseError Jun Wu <quark@fb.com> parents: 28447 diff changeset	88 write(_("(%s)\n") % inst.hint)
24039 2ee35b6ee4fb dispatch: consolidate formatting of ParseErrors Augie Fackler <augie@google.com> parents: 23871 diff changeset	89
14438 08bfec2ef031 dispatch: wrap dispatch related information in a request class Idan Kamara <idankk86@gmail.com> parents: 14286 diff changeset	90 def dispatch(req):
08bfec2ef031 dispatch: wrap dispatch related information in a request class Idan Kamara <idankk86@gmail.com> parents: 14286 diff changeset	91 "run the command specified in req.args"
14615 9fba795dd030 dispatch: assign I/O descriptors from the request to the ui Idan Kamara <idankk86@gmail.com> parents: 14613 diff changeset	92 if req.ferr:
9fba795dd030 dispatch: assign I/O descriptors from the request to the ui Idan Kamara <idankk86@gmail.com> parents: 14613 diff changeset	93 ferr = req.ferr
9fba795dd030 dispatch: assign I/O descriptors from the request to the ui Idan Kamara <idankk86@gmail.com> parents: 14613 diff changeset	94 elif req.ui:
9fba795dd030 dispatch: assign I/O descriptors from the request to the ui Idan Kamara <idankk86@gmail.com> parents: 14613 diff changeset	95 ferr = req.ui.ferr
9fba795dd030 dispatch: assign I/O descriptors from the request to the ui Idan Kamara <idankk86@gmail.com> parents: 14613 diff changeset	96 else:
9fba795dd030 dispatch: assign I/O descriptors from the request to the ui Idan Kamara <idankk86@gmail.com> parents: 14613 diff changeset	97 ferr = sys.stderr
9fba795dd030 dispatch: assign I/O descriptors from the request to the ui Idan Kamara <idankk86@gmail.com> parents: 14613 diff changeset	98
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	99 try:
14439 80c599eee3f3 dispatch: use the request to store the ui object Idan Kamara <idankk86@gmail.com> parents: 14438 diff changeset	100 if not req.ui:
80c599eee3f3 dispatch: use the request to store the ui object Idan Kamara <idankk86@gmail.com> parents: 14438 diff changeset	101 req.ui = uimod.ui()
14438 08bfec2ef031 dispatch: wrap dispatch related information in a request class Idan Kamara <idankk86@gmail.com> parents: 14286 diff changeset	102 if '--traceback' in req.args:
20788 f144928dd058 config: give a useful hint of source for the most common command line settings Mads Kiilerich <madski@unity3d.com> parents: 20330 diff changeset	103 req.ui.setconfig('ui', 'traceback', 'on', '--traceback')
14615 9fba795dd030 dispatch: assign I/O descriptors from the request to the ui Idan Kamara <idankk86@gmail.com> parents: 14613 diff changeset	104
9fba795dd030 dispatch: assign I/O descriptors from the request to the ui Idan Kamara <idankk86@gmail.com> parents: 14613 diff changeset	105 # set ui streams from the request
9fba795dd030 dispatch: assign I/O descriptors from the request to the ui Idan Kamara <idankk86@gmail.com> parents: 14613 diff changeset	106 if req.fin:
9fba795dd030 dispatch: assign I/O descriptors from the request to the ui Idan Kamara <idankk86@gmail.com> parents: 14613 diff changeset	107 req.ui.fin = req.fin
9fba795dd030 dispatch: assign I/O descriptors from the request to the ui Idan Kamara <idankk86@gmail.com> parents: 14613 diff changeset	108 if req.fout:
9fba795dd030 dispatch: assign I/O descriptors from the request to the ui Idan Kamara <idankk86@gmail.com> parents: 14613 diff changeset	109 req.ui.fout = req.fout
9fba795dd030 dispatch: assign I/O descriptors from the request to the ui Idan Kamara <idankk86@gmail.com> parents: 14613 diff changeset	110 if req.ferr:
9fba795dd030 dispatch: assign I/O descriptors from the request to the ui Idan Kamara <idankk86@gmail.com> parents: 14613 diff changeset	111 req.ui.ferr = req.ferr
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26421 diff changeset	112 except error.Abort as inst:
14615 9fba795dd030 dispatch: assign I/O descriptors from the request to the ui Idan Kamara <idankk86@gmail.com> parents: 14613 diff changeset	113 ferr.write(_("abort: %s\n") % inst)
11574 6381fa7bfa53 Abort: add a hint argument, printed in the next line inside parenthesis Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11556 diff changeset	114 if inst.hint:
14615 9fba795dd030 dispatch: assign I/O descriptors from the request to the ui Idan Kamara <idankk86@gmail.com> parents: 14613 diff changeset	115 ferr.write(_("(%s)\n") % inst.hint)
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	116 return -1
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25329 diff changeset	117 except error.ParseError as inst:
24039 2ee35b6ee4fb dispatch: consolidate formatting of ParseErrors Augie Fackler <augie@google.com> parents: 23871 diff changeset	118 _formatparse(ferr.write, inst)
9470 ba75830d17a9 dispatch: catch ConfigError while constructing ui Martin Geisler <mg@lazybytes.net> parents: 8936 diff changeset	119 return -1
14615 9fba795dd030 dispatch: assign I/O descriptors from the request to the ui Idan Kamara <idankk86@gmail.com> parents: 14613 diff changeset	120
19229 41e39a0299cb blackbox: fix recording exit codes (issue3938) Durham Goode <durham@fb.com> parents: 19099 diff changeset	121 msg = ' '.join(' ' in a and repr(a) or a for a in req.args)
41e39a0299cb blackbox: fix recording exit codes (issue3938) Durham Goode <durham@fb.com> parents: 19099 diff changeset	122 starttime = time.time()
41e39a0299cb blackbox: fix recording exit codes (issue3938) Durham Goode <durham@fb.com> parents: 19099 diff changeset	123 ret = None
41e39a0299cb blackbox: fix recording exit codes (issue3938) Durham Goode <durham@fb.com> parents: 19099 diff changeset	124 try:
41e39a0299cb blackbox: fix recording exit codes (issue3938) Durham Goode <durham@fb.com> parents: 19099 diff changeset	125 ret = _runcatch(req)
28520 84cc72c5771e dispatch: catch KeyboardInterrupt more broadly Yuya Nishihara <yuya@tcha.org> parents: 28515 diff changeset	126 except KeyboardInterrupt:
84cc72c5771e dispatch: catch KeyboardInterrupt more broadly Yuya Nishihara <yuya@tcha.org> parents: 28515 diff changeset	127 try:
84cc72c5771e dispatch: catch KeyboardInterrupt more broadly Yuya Nishihara <yuya@tcha.org> parents: 28515 diff changeset	128 req.ui.warn(_("interrupted!\n"))
84cc72c5771e dispatch: catch KeyboardInterrupt more broadly Yuya Nishihara <yuya@tcha.org> parents: 28515 diff changeset	129 except IOError as inst:
84cc72c5771e dispatch: catch KeyboardInterrupt more broadly Yuya Nishihara <yuya@tcha.org> parents: 28515 diff changeset	130 if inst.errno != errno.EPIPE:
84cc72c5771e dispatch: catch KeyboardInterrupt more broadly Yuya Nishihara <yuya@tcha.org> parents: 28515 diff changeset	131 raise
84cc72c5771e dispatch: catch KeyboardInterrupt more broadly Yuya Nishihara <yuya@tcha.org> parents: 28515 diff changeset	132 ret = -1
19229 41e39a0299cb blackbox: fix recording exit codes (issue3938) Durham Goode <durham@fb.com> parents: 19099 diff changeset	133 finally:
41e39a0299cb blackbox: fix recording exit codes (issue3938) Durham Goode <durham@fb.com> parents: 19099 diff changeset	134 duration = time.time() - starttime
28534 293adbaa14a7 dispatch: flush ui before returning from dispatch Jun Wu <quark@fb.com> parents: 28520 diff changeset	135 req.ui.flush()
19229 41e39a0299cb blackbox: fix recording exit codes (issue3938) Durham Goode <durham@fb.com> parents: 19099 diff changeset	136 req.ui.log("commandfinish", "%s exited %s after %0.2f seconds\n",
41e39a0299cb blackbox: fix recording exit codes (issue3938) Durham Goode <durham@fb.com> parents: 19099 diff changeset	137 msg, ret or 0, duration)
28520 84cc72c5771e dispatch: catch KeyboardInterrupt more broadly Yuya Nishihara <yuya@tcha.org> parents: 28515 diff changeset	138 return ret
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	139
14439 80c599eee3f3 dispatch: use the request to store the ui object Idan Kamara <idankk86@gmail.com> parents: 14438 diff changeset	140 def _runcatch(req):
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	141 def catchterm(*args):
7644 182b7114d35a error: move SignalInterrupt Matt Mackall <mpm@selenic.com> parents: 7643 diff changeset	142 raise error.SignalInterrupt
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	143
14439 80c599eee3f3 dispatch: use the request to store the ui object Idan Kamara <idankk86@gmail.com> parents: 14438 diff changeset	144 ui = req.ui
10952 6c2c766afefe dispatch: ignore if signals can not be set Simon Heimberg <simohe@besonet.ch> parents: 10793 diff changeset	145 try:
6c2c766afefe dispatch: ignore if signals can not be set Simon Heimberg <simohe@besonet.ch> parents: 10793 diff changeset	146 for name in 'SIGBREAK', 'SIGHUP', 'SIGTERM':
6c2c766afefe dispatch: ignore if signals can not be set Simon Heimberg <simohe@besonet.ch> parents: 10793 diff changeset	147 num = getattr(signal, name, None)
6c2c766afefe dispatch: ignore if signals can not be set Simon Heimberg <simohe@besonet.ch> parents: 10793 diff changeset	148 if num:
6c2c766afefe dispatch: ignore if signals can not be set Simon Heimberg <simohe@besonet.ch> parents: 10793 diff changeset	149 signal.signal(num, catchterm)
6c2c766afefe dispatch: ignore if signals can not be set Simon Heimberg <simohe@besonet.ch> parents: 10793 diff changeset	150 except ValueError:
6c2c766afefe dispatch: ignore if signals can not be set Simon Heimberg <simohe@besonet.ch> parents: 10793 diff changeset	151 pass # happens if called in a thread
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	152
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	153 try:
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	154 try:
19640 472fa3b782b1 dispatch: add ability to specify a custom pdb module as a debugger Sean Farley <sean.michael.farley@gmail.com> parents: 19639 diff changeset	155 debugger = 'pdb'
472fa3b782b1 dispatch: add ability to specify a custom pdb module as a debugger Sean Farley <sean.michael.farley@gmail.com> parents: 19639 diff changeset	156 debugtrace = {
472fa3b782b1 dispatch: add ability to specify a custom pdb module as a debugger Sean Farley <sean.michael.farley@gmail.com> parents: 19639 diff changeset	157 'pdb' : pdb.set_trace
472fa3b782b1 dispatch: add ability to specify a custom pdb module as a debugger Sean Farley <sean.michael.farley@gmail.com> parents: 19639 diff changeset	158 }
472fa3b782b1 dispatch: add ability to specify a custom pdb module as a debugger Sean Farley <sean.michael.farley@gmail.com> parents: 19639 diff changeset	159 debugmortem = {
472fa3b782b1 dispatch: add ability to specify a custom pdb module as a debugger Sean Farley <sean.michael.farley@gmail.com> parents: 19639 diff changeset	160 'pdb' : pdb.post_mortem
472fa3b782b1 dispatch: add ability to specify a custom pdb module as a debugger Sean Farley <sean.michael.farley@gmail.com> parents: 19639 diff changeset	161 }
19639 09573ad59f7b dispatch: move command line --config argument parsing to _runcatch() Sean Farley <sean.michael.farley@gmail.com> parents: 19229 diff changeset	162
09573ad59f7b dispatch: move command line --config argument parsing to _runcatch() Sean Farley <sean.michael.farley@gmail.com> parents: 19229 diff changeset	163 # read --config before doing anything else
09573ad59f7b dispatch: move command line --config argument parsing to _runcatch() Sean Farley <sean.michael.farley@gmail.com> parents: 19229 diff changeset	164 # (e.g. to change trust settings for reading .hg/hgrc)
09573ad59f7b dispatch: move command line --config argument parsing to _runcatch() Sean Farley <sean.michael.farley@gmail.com> parents: 19229 diff changeset	165 cfgs = _parseconfig(req.ui, _earlygetopt(['--config'], req.args))
09573ad59f7b dispatch: move command line --config argument parsing to _runcatch() Sean Farley <sean.michael.farley@gmail.com> parents: 19229 diff changeset	166
09573ad59f7b dispatch: move command line --config argument parsing to _runcatch() Sean Farley <sean.michael.farley@gmail.com> parents: 19229 diff changeset	167 if req.repo:
09573ad59f7b dispatch: move command line --config argument parsing to _runcatch() Sean Farley <sean.michael.farley@gmail.com> parents: 19229 diff changeset	168 # copy configs that were passed on the cmdline (--config) to
09573ad59f7b dispatch: move command line --config argument parsing to _runcatch() Sean Farley <sean.michael.farley@gmail.com> parents: 19229 diff changeset	169 # the repo ui
20796 131f7fe06e9e check-code: check for argument passing py2.6ism Matt Mackall <mpm@selenic.com> parents: 20788 diff changeset	170 for sec, name, val in cfgs:
131f7fe06e9e check-code: check for argument passing py2.6ism Matt Mackall <mpm@selenic.com> parents: 20788 diff changeset	171 req.repo.ui.setconfig(sec, name, val, source='--config')
19639 09573ad59f7b dispatch: move command line --config argument parsing to _runcatch() Sean Farley <sean.michael.farley@gmail.com> parents: 19229 diff changeset	172
25833 8243e999f22b debugger: mark developer-only option Matt Mackall <mpm@selenic.com> parents: 25660 diff changeset	173 # developer config: ui.debugger
19640 472fa3b782b1 dispatch: add ability to specify a custom pdb module as a debugger Sean Farley <sean.michael.farley@gmail.com> parents: 19639 diff changeset	174 debugger = ui.config("ui", "debugger")
20826 dd2e25e49862 dispatch: only do __import__(debugger) when a debugger is requested Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 20330 diff changeset	175 debugmod = pdb
20122 8f4a226c840c dispatch: turn off custom debugger for HGPLAIN mode Sean Farley <sean.michael.farley@gmail.com> parents: 19640 diff changeset	176 if not debugger or ui.plain():
25833 8243e999f22b debugger: mark developer-only option Matt Mackall <mpm@selenic.com> parents: 25660 diff changeset	177 # if we are in HGPLAIN mode, then disable custom debugging
19640 472fa3b782b1 dispatch: add ability to specify a custom pdb module as a debugger Sean Farley <sean.michael.farley@gmail.com> parents: 19639 diff changeset	178 debugger = 'pdb'
20826 dd2e25e49862 dispatch: only do __import__(debugger) when a debugger is requested Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 20330 diff changeset	179 elif '--debugger' in req.args:
dd2e25e49862 dispatch: only do __import__(debugger) when a debugger is requested Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 20330 diff changeset	180 # This import can be slow for fancy debuggers, so only
dd2e25e49862 dispatch: only do __import__(debugger) when a debugger is requested Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 20330 diff changeset	181 # do it when absolutely necessary, i.e. when actual
dd2e25e49862 dispatch: only do __import__(debugger) when a debugger is requested Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 20330 diff changeset	182 # debugging has been requested
25329 101e84121c13 dispatch: disable demandimport for the --debugger option Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 25277 diff changeset	183 with demandimport.deactivated():
101e84121c13 dispatch: disable demandimport for the --debugger option Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 25277 diff changeset	184 try:
101e84121c13 dispatch: disable demandimport for the --debugger option Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 25277 diff changeset	185 debugmod = __import__(debugger)
101e84121c13 dispatch: disable demandimport for the --debugger option Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 25277 diff changeset	186 except ImportError:
101e84121c13 dispatch: disable demandimport for the --debugger option Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 25277 diff changeset	187 pass # Leave debugmod = pdb
19640 472fa3b782b1 dispatch: add ability to specify a custom pdb module as a debugger Sean Farley <sean.michael.farley@gmail.com> parents: 19639 diff changeset	188
472fa3b782b1 dispatch: add ability to specify a custom pdb module as a debugger Sean Farley <sean.michael.farley@gmail.com> parents: 19639 diff changeset	189 debugtrace[debugger] = debugmod.set_trace
472fa3b782b1 dispatch: add ability to specify a custom pdb module as a debugger Sean Farley <sean.michael.farley@gmail.com> parents: 19639 diff changeset	190 debugmortem[debugger] = debugmod.post_mortem
472fa3b782b1 dispatch: add ability to specify a custom pdb module as a debugger Sean Farley <sean.michael.farley@gmail.com> parents: 19639 diff changeset	191
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	192 # enter the debugger before command execution
14438 08bfec2ef031 dispatch: wrap dispatch related information in a request class Idan Kamara <idankk86@gmail.com> parents: 14286 diff changeset	193 if '--debugger' in req.args:
11495 6ee107782018 debugger: give a little intro before entering pdb Mads Kiilerich <mads@kiilerich.com> parents: 11494 diff changeset	194 ui.warn(_("entering debugger - "
6ee107782018 debugger: give a little intro before entering pdb Mads Kiilerich <mads@kiilerich.com> parents: 11494 diff changeset	195 "type c to continue starting hg or h for help\n"))
19640 472fa3b782b1 dispatch: add ability to specify a custom pdb module as a debugger Sean Farley <sean.michael.farley@gmail.com> parents: 19639 diff changeset	196
472fa3b782b1 dispatch: add ability to specify a custom pdb module as a debugger Sean Farley <sean.michael.farley@gmail.com> parents: 19639 diff changeset	197 if (debugger != 'pdb' and
472fa3b782b1 dispatch: add ability to specify a custom pdb module as a debugger Sean Farley <sean.michael.farley@gmail.com> parents: 19639 diff changeset	198 debugtrace[debugger] == debugtrace['pdb']):
472fa3b782b1 dispatch: add ability to specify a custom pdb module as a debugger Sean Farley <sean.michael.farley@gmail.com> parents: 19639 diff changeset	199 ui.warn(_("%s debugger specified "
472fa3b782b1 dispatch: add ability to specify a custom pdb module as a debugger Sean Farley <sean.michael.farley@gmail.com> parents: 19639 diff changeset	200 "but its module was not found\n") % debugger)
26236 2e42517129ca dispatch: use the right context manager to deactivate demandimport Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 26216 diff changeset	201 with demandimport.deactivated():
26216 e86d12404d69 dispatch: disable demandimport when invoking the debugger Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 26191 diff changeset	202 debugtrace[debugger]()
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	203 try:
14439 80c599eee3f3 dispatch: use the request to store the ui object Idan Kamara <idankk86@gmail.com> parents: 14438 diff changeset	204 return _dispatch(req)
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	205 finally:
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	206 ui.flush()
16705 c2d9ef43ff6c check-code: ignore naked excepts with a "re-raise" comment Brodie Rao <brodie@sf.io> parents: 16686 diff changeset	207 except: # re-raises
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	208 # enter the debugger when we hit an exception
14438 08bfec2ef031 dispatch: wrap dispatch related information in a request class Idan Kamara <idankk86@gmail.com> parents: 14286 diff changeset	209 if '--debugger' in req.args:
11494 2347513f562a debugger: show traceback before entering pdb post-mortem Mads Kiilerich <mads@kiilerich.com> parents: 11330 diff changeset	210 traceback.print_exc()
19640 472fa3b782b1 dispatch: add ability to specify a custom pdb module as a debugger Sean Farley <sean.michael.farley@gmail.com> parents: 19639 diff changeset	211 debugmortem[debugger](sys.exc_info()[2])
8206 cce63ef1045b ui: print_exc() -> traceback() Matt Mackall <mpm@selenic.com> parents: 8190 diff changeset	212 ui.traceback()
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	213 raise
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	214
7645 020a896a5292 dispatch: sort exception handlers Matt Mackall <mpm@selenic.com> parents: 7644 diff changeset	215 # Global exception handling, alphabetically
020a896a5292 dispatch: sort exception handlers Matt Mackall <mpm@selenic.com> parents: 7644 diff changeset	216 # Mercurial-specific first, followed by built-in and library exceptions
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25329 diff changeset	217 except error.AmbiguousCommand as inst:
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	218 ui.warn(_("hg: command '%s' is ambiguous:\n %s\n") %
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	219 (inst.args[0], " ".join(inst.args[1])))
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25329 diff changeset	220 except error.ParseError as inst:
24039 2ee35b6ee4fb dispatch: consolidate formatting of ParseErrors Augie Fackler <augie@google.com> parents: 23871 diff changeset	221 _formatparse(ui.warn, inst)
11288 2123aad24d56 error: add new ParseError for various parsing errors Matt Mackall <mpm@selenic.com> parents: 11287 diff changeset	222 return -1
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25329 diff changeset	223 except error.LockHeld as inst:
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	224 if inst.errno == errno.ETIMEDOUT:
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	225 reason = _('timed out waiting for lock held by %s') % inst.locker
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	226 else:
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	227 reason = _('lock held by %s') % inst.locker
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	228 ui.warn(_("abort: %s: %s\n") % (inst.desc or inst.filename, reason))
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25329 diff changeset	229 except error.LockUnavailable as inst:
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	230 ui.warn(_("abort: could not lock %s: %s\n") %
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	231 (inst.desc or inst.filename, inst.strerror))
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25329 diff changeset	232 except error.CommandError as inst:
7645 020a896a5292 dispatch: sort exception handlers Matt Mackall <mpm@selenic.com> parents: 7644 diff changeset	233 if inst.args[0]:
020a896a5292 dispatch: sort exception handlers Matt Mackall <mpm@selenic.com> parents: 7644 diff changeset	234 ui.warn(_("hg %s: %s\n") % (inst.args[0], inst.args[1]))
14286 005a540e9aee help: add -c/--command flag to only show command help (issue2799) Martin Geisler <mg@aragost.com> parents: 14265 diff changeset	235 commands.help_(ui, inst.args[0], full=False, command=True)
7645 020a896a5292 dispatch: sort exception handlers Matt Mackall <mpm@selenic.com> parents: 7644 diff changeset	236 else:
020a896a5292 dispatch: sort exception handlers Matt Mackall <mpm@selenic.com> parents: 7644 diff changeset	237 ui.warn(_("hg: %s\n") % inst.args[1])
020a896a5292 dispatch: sort exception handlers Matt Mackall <mpm@selenic.com> parents: 7644 diff changeset	238 commands.help_(ui, 'shortlist')
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25329 diff changeset	239 except error.OutOfBandError as inst:
25242 8de7d1d937b3 error: allow a 'hint' to OutOfBandError Pierre-Yves David <pierre-yves.david@fb.com> parents: 25187 diff changeset	240 if inst.args:
8de7d1d937b3 error: allow a 'hint' to OutOfBandError Pierre-Yves David <pierre-yves.david@fb.com> parents: 25187 diff changeset	241 msg = _("abort: remote error:\n")
8de7d1d937b3 error: allow a 'hint' to OutOfBandError Pierre-Yves David <pierre-yves.david@fb.com> parents: 25187 diff changeset	242 else:
8de7d1d937b3 error: allow a 'hint' to OutOfBandError Pierre-Yves David <pierre-yves.david@fb.com> parents: 25187 diff changeset	243 msg = _("abort: remote error\n")
8de7d1d937b3 error: allow a 'hint' to OutOfBandError Pierre-Yves David <pierre-yves.david@fb.com> parents: 25187 diff changeset	244 ui.warn(msg)
8de7d1d937b3 error: allow a 'hint' to OutOfBandError Pierre-Yves David <pierre-yves.david@fb.com> parents: 25187 diff changeset	245 if inst.args:
8de7d1d937b3 error: allow a 'hint' to OutOfBandError Pierre-Yves David <pierre-yves.david@fb.com> parents: 25187 diff changeset	246 ui.warn(''.join(inst.args))
8de7d1d937b3 error: allow a 'hint' to OutOfBandError Pierre-Yves David <pierre-yves.david@fb.com> parents: 25187 diff changeset	247 if inst.hint:
8de7d1d937b3 error: allow a 'hint' to OutOfBandError Pierre-Yves David <pierre-yves.david@fb.com> parents: 25187 diff changeset	248 ui.warn('(%s)\n' % inst.hint)
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25329 diff changeset	249 except error.RepoError as inst:
7645 020a896a5292 dispatch: sort exception handlers Matt Mackall <mpm@selenic.com> parents: 7644 diff changeset	250 ui.warn(_("abort: %s!\n") % inst)
14761 1a9256cdf10f error: Add a hint argument to RepoError Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 14754 diff changeset	251 if inst.hint:
1a9256cdf10f error: Add a hint argument to RepoError Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 14754 diff changeset	252 ui.warn(_("(%s)\n") % inst.hint)
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25329 diff changeset	253 except error.ResponseError as inst:
7645 020a896a5292 dispatch: sort exception handlers Matt Mackall <mpm@selenic.com> parents: 7644 diff changeset	254 ui.warn(_("abort: %s") % inst.args[0])
020a896a5292 dispatch: sort exception handlers Matt Mackall <mpm@selenic.com> parents: 7644 diff changeset	255 if not isinstance(inst.args[1], basestring):
020a896a5292 dispatch: sort exception handlers Matt Mackall <mpm@selenic.com> parents: 7644 diff changeset	256 ui.warn(" %r\n" % (inst.args[1],))
020a896a5292 dispatch: sort exception handlers Matt Mackall <mpm@selenic.com> parents: 7644 diff changeset	257 elif not inst.args[1]:
020a896a5292 dispatch: sort exception handlers Matt Mackall <mpm@selenic.com> parents: 7644 diff changeset	258 ui.warn(_(" empty string\n"))
020a896a5292 dispatch: sort exception handlers Matt Mackall <mpm@selenic.com> parents: 7644 diff changeset	259 else:
020a896a5292 dispatch: sort exception handlers Matt Mackall <mpm@selenic.com> parents: 7644 diff changeset	260 ui.warn("\n%r\n" % util.ellipsis(inst.args[1]))
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25329 diff changeset	261 except error.CensoredNodeError as inst:
22595 244478687edd error: add CensoredNodeError, will be thrown when content deliberately erased Mike Edgar <adgar@google.com> parents: 22378 diff changeset	262 ui.warn(_("abort: file censored %s!\n") % inst)
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25329 diff changeset	263 except error.RevlogError as inst:
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	264 ui.warn(_("abort: %s!\n") % inst)
7644 182b7114d35a error: move SignalInterrupt Matt Mackall <mpm@selenic.com> parents: 7643 diff changeset	265 except error.SignalInterrupt:
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	266 ui.warn(_("killed!\n"))
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25329 diff changeset	267 except error.UnknownCommand as inst:
7645 020a896a5292 dispatch: sort exception handlers Matt Mackall <mpm@selenic.com> parents: 7644 diff changeset	268 ui.warn(_("hg: unknown command '%s'\n") % inst.args[0])
10364 de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10282 diff changeset	269 try:
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10282 diff changeset	270 # check if the command is in a disabled extension
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10282 diff changeset	271 # (but don't check for extensions themselves)
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10282 diff changeset	272 commands.help_(ui, inst.args[0], unknowncmd=True)
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26421 diff changeset	273 except (error.UnknownCommand, error.Abort):
24222 02d7b5cd373b dispatch: offer suggestions of similar-named commands Augie Fackler <augie@google.com> parents: 24221 diff changeset	274 suggested = False
02d7b5cd373b dispatch: offer suggestions of similar-named commands Augie Fackler <augie@google.com> parents: 24221 diff changeset	275 if len(inst.args) == 2:
02d7b5cd373b dispatch: offer suggestions of similar-named commands Augie Fackler <augie@google.com> parents: 24221 diff changeset	276 sim = _getsimilar(inst.args[1], inst.args[0])
02d7b5cd373b dispatch: offer suggestions of similar-named commands Augie Fackler <augie@google.com> parents: 24221 diff changeset	277 if sim:
27623 b3376fba4ab9 dispatch: report similar names consistently Bryan O'Sullivan <bos@serpentine.com> parents: 27615 diff changeset	278 _reportsimilar(ui.warn, sim)
24222 02d7b5cd373b dispatch: offer suggestions of similar-named commands Augie Fackler <augie@google.com> parents: 24221 diff changeset	279 suggested = True
02d7b5cd373b dispatch: offer suggestions of similar-named commands Augie Fackler <augie@google.com> parents: 24221 diff changeset	280 if not suggested:
02d7b5cd373b dispatch: offer suggestions of similar-named commands Augie Fackler <augie@google.com> parents: 24221 diff changeset	281 commands.help_(ui, 'shortlist')
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25329 diff changeset	282 except error.InterventionRequired as inst:
18932 7b4b9e8ea12e dispatch: catch InterventionRequired and print the message with no prefix Augie Fackler <raf@durin42.com> parents: 18758 diff changeset	283 ui.warn("%s\n" % inst)
27628 707d66afce21 error: make InterventionRequired take a hint timeless <timeless@mozdev.org> parents: 27623 diff changeset	284 if inst.hint:
707d66afce21 error: make InterventionRequired take a hint timeless <timeless@mozdev.org> parents: 27623 diff changeset	285 ui.warn(_("(%s)\n") % inst.hint)
18935 e5d9441ec281 dispatch: exit with status 1 for an InterventionRequired exception (bc) Augie Fackler <raf@durin42.com> parents: 18932 diff changeset	286 return 1
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26421 diff changeset	287 except error.Abort as inst:
7645 020a896a5292 dispatch: sort exception handlers Matt Mackall <mpm@selenic.com> parents: 7644 diff changeset	288 ui.warn(_("abort: %s\n") % inst)
11574 6381fa7bfa53 Abort: add a hint argument, printed in the next line inside parenthesis Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11556 diff changeset	289 if inst.hint:
11683 757f39fa1162 dispatch: write Abort hint to stderr too Patrick Mezard <pmezard@gmail.com> parents: 11601 diff changeset	290 ui.warn(_("(%s)\n") % inst.hint)
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25329 diff changeset	291 except ImportError as inst:
11053 59d0d715fbfa dispatch: don't mangle ImportError abort messages Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10952 diff changeset	292 ui.warn(_("abort: %s!\n") % inst)
7645 020a896a5292 dispatch: sort exception handlers Matt Mackall <mpm@selenic.com> parents: 7644 diff changeset	293 m = str(inst).split()[-1]
020a896a5292 dispatch: sort exception handlers Matt Mackall <mpm@selenic.com> parents: 7644 diff changeset	294 if m in "mpatch bdiff".split():
020a896a5292 dispatch: sort exception handlers Matt Mackall <mpm@selenic.com> parents: 7644 diff changeset	295 ui.warn(_("(did you forget to compile extensions?)\n"))
020a896a5292 dispatch: sort exception handlers Matt Mackall <mpm@selenic.com> parents: 7644 diff changeset	296 elif m in "zlib".split():
020a896a5292 dispatch: sort exception handlers Matt Mackall <mpm@selenic.com> parents: 7644 diff changeset	297 ui.warn(_("(is your Python install correct?)\n"))
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25329 diff changeset	298 except IOError as inst:
14950 144e97421f6b dispatch: use safehasattr instead of hasattr Augie Fackler <durin42@gmail.com> parents: 14918 diff changeset	299 if util.safehasattr(inst, "code"):
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	300 ui.warn(_("abort: %s\n") % inst)
14950 144e97421f6b dispatch: use safehasattr instead of hasattr Augie Fackler <durin42@gmail.com> parents: 14918 diff changeset	301 elif util.safehasattr(inst, "reason"):
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	302 try: # usually it is in the form (errno, strerror)
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	303 reason = inst.reason.args[1]
14096 dea93484cf9f dispatch: handle IndexErrors Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 14004 diff changeset	304 except (AttributeError, IndexError):
17299 e51d4aedace9 check-code: indent 4 spaces in py files Mads Kiilerich <mads@kiilerich.com> parents: 17228 diff changeset	305 # it might be anything, for example a string
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	306 reason = inst.reason
24152 97a548aeb749 dispatch: work around UnicodeDecodeError caused by SSLError of Python 2.7.9 Yuya Nishihara <yuya@tcha.org> parents: 23871 diff changeset	307 if isinstance(reason, unicode):
97a548aeb749 dispatch: work around UnicodeDecodeError caused by SSLError of Python 2.7.9 Yuya Nishihara <yuya@tcha.org> parents: 23871 diff changeset	308 # SSLError of Python 2.7.9 contains a unicode
97a548aeb749 dispatch: work around UnicodeDecodeError caused by SSLError of Python 2.7.9 Yuya Nishihara <yuya@tcha.org> parents: 23871 diff changeset	309 reason = reason.encode(encoding.encoding, 'replace')
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	310 ui.warn(_("abort: error: %s\n") % reason)
21824 57c70d3ad1c9 dispatch: handle empty IOError args Matt Mackall <mpm@selenic.com> parents: 21572 diff changeset	311 elif (util.safehasattr(inst, "args")
57c70d3ad1c9 dispatch: handle empty IOError args Matt Mackall <mpm@selenic.com> parents: 21572 diff changeset	312 and inst.args and inst.args[0] == errno.EPIPE):
26350 ccab61d84ea7 dispatch: stop warning about EPIPE in --debug mode Daniel Colascione <dancol@fb.com> parents: 26263 diff changeset	313 pass
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	314 elif getattr(inst, "strerror", None):
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	315 if getattr(inst, "filename", None):
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	316 ui.warn(_("abort: %s: %s\n") % (inst.strerror, inst.filename))
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	317 else:
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	318 ui.warn(_("abort: %s\n") % inst.strerror)
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	319 else:
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	320 raise
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25329 diff changeset	321 except OSError as inst:
18227 720308f741cb dispatch: show empty filename in OSError aborts Mads Kiilerich <mads@kiilerich.com> parents: 18224 diff changeset	322 if getattr(inst, "filename", None) is not None:
720308f741cb dispatch: show empty filename in OSError aborts Mads Kiilerich <mads@kiilerich.com> parents: 18224 diff changeset	323 ui.warn(_("abort: %s: '%s'\n") % (inst.strerror, inst.filename))
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	324 else:
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	325 ui.warn(_("abort: %s\n") % inst.strerror)
7645 020a896a5292 dispatch: sort exception handlers Matt Mackall <mpm@selenic.com> parents: 7644 diff changeset	326 except KeyboardInterrupt:
28520 84cc72c5771e dispatch: catch KeyboardInterrupt more broadly Yuya Nishihara <yuya@tcha.org> parents: 28515 diff changeset	327 raise
5633 e04a65111a80 dispatch: report OOM rather than traceback Matt Mackall <mpm@selenic.com> parents: 5542 diff changeset	328 except MemoryError:
e04a65111a80 dispatch: report OOM rather than traceback Matt Mackall <mpm@selenic.com> parents: 5542 diff changeset	329 ui.warn(_("abort: out of memory\n"))
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25329 diff changeset	330 except SystemExit as inst:
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	331 # Commands shouldn't sys.exit directly, but give a return code.
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	332 # Just in case catch this and and pass exit code to caller.
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	333 return inst.code
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25329 diff changeset	334 except socket.error as inst:
7645 020a896a5292 dispatch: sort exception handlers Matt Mackall <mpm@selenic.com> parents: 7644 diff changeset	335 ui.warn(_("abort: %s\n") % inst.args[-1])
28784 09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	336 except: # perhaps re-raises
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	337 if not handlecommandexception(ui):
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	338 raise
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	339
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	340 return -1
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	341
14265 e4ab5ae193f2 add positional arguments to non-shell aliases Alexander Solovyov <alexander@solovyov.net> parents: 14096 diff changeset	342 def aliasargs(fn, givenargs):
e4ab5ae193f2 add positional arguments to non-shell aliases Alexander Solovyov <alexander@solovyov.net> parents: 14096 diff changeset	343 args = getattr(fn, 'args', [])
16294 795d591b6ef5 alias: abort on missing positional args (issue3331) Matt Mackall <mpm@selenic.com> parents: 16277 diff changeset	344 if args:
14265 e4ab5ae193f2 add positional arguments to non-shell aliases Alexander Solovyov <alexander@solovyov.net> parents: 14096 diff changeset	345 cmd = ' '.join(map(util.shellquote, args))
e4ab5ae193f2 add positional arguments to non-shell aliases Alexander Solovyov <alexander@solovyov.net> parents: 14096 diff changeset	346
e4ab5ae193f2 add positional arguments to non-shell aliases Alexander Solovyov <alexander@solovyov.net> parents: 14096 diff changeset	347 nums = []
e4ab5ae193f2 add positional arguments to non-shell aliases Alexander Solovyov <alexander@solovyov.net> parents: 14096 diff changeset	348 def replacer(m):
e4ab5ae193f2 add positional arguments to non-shell aliases Alexander Solovyov <alexander@solovyov.net> parents: 14096 diff changeset	349 num = int(m.group(1)) - 1
e4ab5ae193f2 add positional arguments to non-shell aliases Alexander Solovyov <alexander@solovyov.net> parents: 14096 diff changeset	350 nums.append(num)
16277 1c2aaf05f7d7 aliases: use empty string for missing position parameters (issue3331) Matt Mackall <mpm@selenic.com> parents: 15781 diff changeset	351 if num < len(givenargs):
1c2aaf05f7d7 aliases: use empty string for missing position parameters (issue3331) Matt Mackall <mpm@selenic.com> parents: 15781 diff changeset	352 return givenargs[num]
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26421 diff changeset	353 raise error.Abort(_('too few arguments for command alias'))
14265 e4ab5ae193f2 add positional arguments to non-shell aliases Alexander Solovyov <alexander@solovyov.net> parents: 14096 diff changeset	354 cmd = re.sub(r'\$(\d+\|\$)', replacer, cmd)
e4ab5ae193f2 add positional arguments to non-shell aliases Alexander Solovyov <alexander@solovyov.net> parents: 14096 diff changeset	355 givenargs = [x for i, x in enumerate(givenargs)
e4ab5ae193f2 add positional arguments to non-shell aliases Alexander Solovyov <alexander@solovyov.net> parents: 14096 diff changeset	356 if i not in nums]
e4ab5ae193f2 add positional arguments to non-shell aliases Alexander Solovyov <alexander@solovyov.net> parents: 14096 diff changeset	357 args = shlex.split(cmd)
e4ab5ae193f2 add positional arguments to non-shell aliases Alexander Solovyov <alexander@solovyov.net> parents: 14096 diff changeset	358 return args + givenargs
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	359
22158 bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	360 def aliasinterpolate(name, args, cmd):
bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	361 '''interpolate args into cmd for shell aliases
bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	362
bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	363 This also handles $0, $@ and "$@".
bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	364 '''
bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	365 # util.interpolate can't deal with "$@" (with quotes) because it's only
bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	366 # built to match prefix + patterns.
bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	367 replacemap = dict(('$%d' % (i + 1), arg) for i, arg in enumerate(args))
bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	368 replacemap['$0'] = name
bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	369 replacemap['$$'] = '$'
bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	370 replacemap['$@'] = ' '.join(args)
bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	371 # Typical Unix shells interpolate "$@" (with quotes) as all the positional
bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	372 # parameters, separated out into words. Emulate the same behavior here by
bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	373 # quoting the arguments individually. POSIX shells will then typically
bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	374 # tokenize each argument into exactly one word.
bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	375 replacemap['"$@"'] = ' '.join(util.shellquote(arg) for arg in args)
bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	376 # escape '\$' for regex
bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	377 regex = '\|'.join(replacemap.keys()).replace('$', r'\$')
bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	378 r = re.compile(regex)
bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	379 return r.sub(lambda x: replacemap[x.group()], cmd)
bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	380
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	381 class cmdalias(object):
28828 3640c1702c43 help: report source of aliases timeless <timeless@mozdev.org> parents: 28821 diff changeset	382 def __init__(self, name, definition, cmdtable, source):
12039 18e1e7520b67 alias: make shadowing behavior more consistent (issue2054) Brodie Rao <brodie@bitheap.org> parents: 11712 diff changeset	383 self.name = self.cmd = name
12092 4982fa38e544 alias: print what command is being shadowed in debug message Brodie Rao <brodie@bitheap.org> parents: 12070 diff changeset	384 self.cmdname = ''
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	385 self.definition = definition
22160 645457f73aa6 alias: keep error message in "badalias" so that help can see it Yuya Nishihara <yuya@tcha.org> parents: 22158 diff changeset	386 self.fn = None
29087 ad1bdea43965 dispatch: defer environment variable resolution in alias commands (BC) Jun Wu <quark@fb.com> parents: 28861 diff changeset	387 self.givenargs = []
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	388 self.opts = []
21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	389 self.help = ''
22160 645457f73aa6 alias: keep error message in "badalias" so that help can see it Yuya Nishihara <yuya@tcha.org> parents: 22158 diff changeset	390 self.badalias = None
22161 063628423fd1 alias: provide "unknowncmd" flag to tell help to look for disabled command Yuya Nishihara <yuya@tcha.org> parents: 22160 diff changeset	391 self.unknowncmd = False
28828 3640c1702c43 help: report source of aliases timeless <timeless@mozdev.org> parents: 28821 diff changeset	392 self.source = source
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	393
21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	394 try:
12039 18e1e7520b67 alias: make shadowing behavior more consistent (issue2054) Brodie Rao <brodie@bitheap.org> parents: 11712 diff changeset	395 aliases, entry = cmdutil.findcmd(self.name, cmdtable)
18e1e7520b67 alias: make shadowing behavior more consistent (issue2054) Brodie Rao <brodie@bitheap.org> parents: 11712 diff changeset	396 for alias, e in cmdtable.iteritems():
18e1e7520b67 alias: make shadowing behavior more consistent (issue2054) Brodie Rao <brodie@bitheap.org> parents: 11712 diff changeset	397 if e is entry:
18e1e7520b67 alias: make shadowing behavior more consistent (issue2054) Brodie Rao <brodie@bitheap.org> parents: 11712 diff changeset	398 self.cmd = alias
18e1e7520b67 alias: make shadowing behavior more consistent (issue2054) Brodie Rao <brodie@bitheap.org> parents: 11712 diff changeset	399 break
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	400 self.shadows = True
21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	401 except error.UnknownCommand:
21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	402 self.shadows = False
21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	403
21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	404 if not self.definition:
22160 645457f73aa6 alias: keep error message in "badalias" so that help can see it Yuya Nishihara <yuya@tcha.org> parents: 22158 diff changeset	405 self.badalias = _("no definition for alias '%s'") % self.name
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	406 return
21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	407
11524 24965bb270b7 dispatch: add shell aliases Steve Losh <steve@stevelosh.com> parents: 11495 diff changeset	408 if self.definition.startswith('!'):
12536 208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	409 self.shell = True
11524 24965bb270b7 dispatch: add shell aliases Steve Losh <steve@stevelosh.com> parents: 11495 diff changeset	410 def fn(ui, *args):
11989 f853873fc66d aliases: provide more flexible ways to work with shell alias arguments Steve Losh <steve@stevelosh.com> parents: 11985 diff changeset	411 env = {'HG_ARGS': ' '.join((self.name,) + args)}
f853873fc66d aliases: provide more flexible ways to work with shell alias arguments Steve Losh <steve@stevelosh.com> parents: 11985 diff changeset	412 def _checkvar(m):
13392 777cef34a890 dispatch: support for $ escaping in shell-alias definition Roman Sokolov <sokolov.r.v@gmail.com> parents: 13382 diff changeset	413 if m.groups()[0] == '$':
777cef34a890 dispatch: support for $ escaping in shell-alias definition Roman Sokolov <sokolov.r.v@gmail.com> parents: 13382 diff changeset	414 return m.group()
777cef34a890 dispatch: support for $ escaping in shell-alias definition Roman Sokolov <sokolov.r.v@gmail.com> parents: 13382 diff changeset	415 elif int(m.groups()[0]) <= len(args):
11989 f853873fc66d aliases: provide more flexible ways to work with shell alias arguments Steve Losh <steve@stevelosh.com> parents: 11985 diff changeset	416 return m.group()
f853873fc66d aliases: provide more flexible ways to work with shell alias arguments Steve Losh <steve@stevelosh.com> parents: 11985 diff changeset	417 else:
14708 8083f4d00bd1 i18n: remove translation of debug messages David Soria Parra <dsp@php.net> parents: 14704 diff changeset	418 ui.debug("No argument found for substitution "
8083f4d00bd1 i18n: remove translation of debug messages David Soria Parra <dsp@php.net> parents: 14704 diff changeset	419 "of %i variable in alias '%s' definition."
13393 d38d500deb08 dispatch: debug message for missing arguments in shell alias Roman Sokolov <sokolov.r.v@gmail.com> parents: 13392 diff changeset	420 % (int(m.groups()[0]), self.name))
11989 f853873fc66d aliases: provide more flexible ways to work with shell alias arguments Steve Losh <steve@stevelosh.com> parents: 11985 diff changeset	421 return ''
13392 777cef34a890 dispatch: support for $ escaping in shell-alias definition Roman Sokolov <sokolov.r.v@gmail.com> parents: 13382 diff changeset	422 cmd = re.sub(r'\$(\d+\|\$)', _checkvar, self.definition[1:])
22158 bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	423 cmd = aliasinterpolate(self.name, args, cmd)
23270 41c03b7592ed util.system: use ui.system() in place of optional ui.fout parameter Yuya Nishihara <yuya@tcha.org> parents: 22595 diff changeset	424 return ui.system(cmd, environ=env)
11524 24965bb270b7 dispatch: add shell aliases Steve Losh <steve@stevelosh.com> parents: 11495 diff changeset	425 self.fn = fn
24965bb270b7 dispatch: add shell aliases Steve Losh <steve@stevelosh.com> parents: 11495 diff changeset	426 return
24965bb270b7 dispatch: add shell aliases Steve Losh <steve@stevelosh.com> parents: 11495 diff changeset	427
21569 c5afb07c33d3 alias: handle shlex error in command aliases Yuya Nishihara <yuya@tcha.org> parents: 21556 diff changeset	428 try:
c5afb07c33d3 alias: handle shlex error in command aliases Yuya Nishihara <yuya@tcha.org> parents: 21556 diff changeset	429 args = shlex.split(self.definition)
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25329 diff changeset	430 except ValueError as inst:
22160 645457f73aa6 alias: keep error message in "badalias" so that help can see it Yuya Nishihara <yuya@tcha.org> parents: 22158 diff changeset	431 self.badalias = (_("error in definition for alias '%s': %s")
645457f73aa6 alias: keep error message in "badalias" so that help can see it Yuya Nishihara <yuya@tcha.org> parents: 22158 diff changeset	432 % (self.name, inst))
21569 c5afb07c33d3 alias: handle shlex error in command aliases Yuya Nishihara <yuya@tcha.org> parents: 21556 diff changeset	433 return
12092 4982fa38e544 alias: print what command is being shadowed in debug message Brodie Rao <brodie@bitheap.org> parents: 12070 diff changeset	434 self.cmdname = cmd = args.pop(0)
29087 ad1bdea43965 dispatch: defer environment variable resolution in alias commands (BC) Jun Wu <quark@fb.com> parents: 28861 diff changeset	435 self.givenargs = args
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	436
18693 633cd0c46e6a dispatch: also a separate warning message on aliases with --config Simon Heimberg <simohe@besonet.ch> parents: 18691 diff changeset	437 for invalidarg in ("--cwd", "-R", "--repository", "--repo", "--config"):
11695 ee8f36a6c766 alias: improved diagnostic when arguments include --cwd, etc. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11681 diff changeset	438 if _earlygetopt([invalidarg], args):
22160 645457f73aa6 alias: keep error message in "badalias" so that help can see it Yuya Nishihara <yuya@tcha.org> parents: 22158 diff changeset	439 self.badalias = (_("error in definition for alias '%s': %s may "
645457f73aa6 alias: keep error message in "badalias" so that help can see it Yuya Nishihara <yuya@tcha.org> parents: 22158 diff changeset	440 "only be given on the command line")
645457f73aa6 alias: keep error message in "badalias" so that help can see it Yuya Nishihara <yuya@tcha.org> parents: 22158 diff changeset	441 % (self.name, invalidarg))
11695 ee8f36a6c766 alias: improved diagnostic when arguments include --cwd, etc. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11681 diff changeset	442 return
ee8f36a6c766 alias: improved diagnostic when arguments include --cwd, etc. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11681 diff changeset	443
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	444 try:
9993 8bce1e0d2801 alias: do not crash when aliased command has no usage help text Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9825 diff changeset	445 tableentry = cmdutil.findcmd(cmd, cmdtable, False)[1]
8bce1e0d2801 alias: do not crash when aliased command has no usage help text Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9825 diff changeset	446 if len(tableentry) > 2:
8bce1e0d2801 alias: do not crash when aliased command has no usage help text Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9825 diff changeset	447 self.fn, self.opts, self.help = tableentry
8bce1e0d2801 alias: do not crash when aliased command has no usage help text Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9825 diff changeset	448 else:
8bce1e0d2801 alias: do not crash when aliased command has no usage help text Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9825 diff changeset	449 self.fn, self.opts = tableentry
8bce1e0d2801 alias: do not crash when aliased command has no usage help text Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9825 diff changeset	450
9876 6e8a16dd3e30 alias: improve help text for command aliases Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 9875 diff changeset	451 if self.help.startswith("hg " + cmd):
6e8a16dd3e30 alias: improve help text for command aliases Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 9875 diff changeset	452 # drop prefix in old-style help lines so hg shows the alias
6e8a16dd3e30 alias: improve help text for command aliases Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 9875 diff changeset	453 self.help = self.help[4 + len(cmd):]
10564 6ded6243bde2 alias: fixes exception when displaying translated help text Yuya Nishihara <yuya@tcha.org> parents: 10402 diff changeset	454 self.__doc__ = self.fn.__doc__
9876 6e8a16dd3e30 alias: improve help text for command aliases Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 9875 diff changeset	455
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	456 except error.UnknownCommand:
22160 645457f73aa6 alias: keep error message in "badalias" so that help can see it Yuya Nishihara <yuya@tcha.org> parents: 22158 diff changeset	457 self.badalias = (_("alias '%s' resolves to unknown command '%s'")
645457f73aa6 alias: keep error message in "badalias" so that help can see it Yuya Nishihara <yuya@tcha.org> parents: 22158 diff changeset	458 % (self.name, cmd))
22161 063628423fd1 alias: provide "unknowncmd" flag to tell help to look for disabled command Yuya Nishihara <yuya@tcha.org> parents: 22160 diff changeset	459 self.unknowncmd = True
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	460 except error.AmbiguousCommand:
22160 645457f73aa6 alias: keep error message in "badalias" so that help can see it Yuya Nishihara <yuya@tcha.org> parents: 22158 diff changeset	461 self.badalias = (_("alias '%s' resolves to ambiguous command '%s'")
645457f73aa6 alias: keep error message in "badalias" so that help can see it Yuya Nishihara <yuya@tcha.org> parents: 22158 diff changeset	462 % (self.name, cmd))
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	463
29087 ad1bdea43965 dispatch: defer environment variable resolution in alias commands (BC) Jun Wu <quark@fb.com> parents: 28861 diff changeset	464 @property
ad1bdea43965 dispatch: defer environment variable resolution in alias commands (BC) Jun Wu <quark@fb.com> parents: 28861 diff changeset	465 def args(self):
ad1bdea43965 dispatch: defer environment variable resolution in alias commands (BC) Jun Wu <quark@fb.com> parents: 28861 diff changeset	466 args = map(util.expandpath, self.givenargs)
ad1bdea43965 dispatch: defer environment variable resolution in alias commands (BC) Jun Wu <quark@fb.com> parents: 28861 diff changeset	467 return aliasargs(self.fn, args)
ad1bdea43965 dispatch: defer environment variable resolution in alias commands (BC) Jun Wu <quark@fb.com> parents: 28861 diff changeset	468
28621 d856e85a8a7a dispatch: make cmdalias forward command attributes to function Yuya Nishihara <yuya@tcha.org> parents: 28538 diff changeset	469 def __getattr__(self, name):
d856e85a8a7a dispatch: make cmdalias forward command attributes to function Yuya Nishihara <yuya@tcha.org> parents: 28538 diff changeset	470 adefaults = {'norepo': True, 'optionalrepo': False, 'inferrepo': False}
d856e85a8a7a dispatch: make cmdalias forward command attributes to function Yuya Nishihara <yuya@tcha.org> parents: 28538 diff changeset	471 if name not in adefaults:
d856e85a8a7a dispatch: make cmdalias forward command attributes to function Yuya Nishihara <yuya@tcha.org> parents: 28538 diff changeset	472 raise AttributeError(name)
d856e85a8a7a dispatch: make cmdalias forward command attributes to function Yuya Nishihara <yuya@tcha.org> parents: 28538 diff changeset	473 if self.badalias or util.safehasattr(self, 'shell'):
d856e85a8a7a dispatch: make cmdalias forward command attributes to function Yuya Nishihara <yuya@tcha.org> parents: 28538 diff changeset	474 return adefaults[name]
d856e85a8a7a dispatch: make cmdalias forward command attributes to function Yuya Nishihara <yuya@tcha.org> parents: 28538 diff changeset	475 return getattr(self.fn, name)
d856e85a8a7a dispatch: make cmdalias forward command attributes to function Yuya Nishihara <yuya@tcha.org> parents: 28538 diff changeset	476
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	477 def __call__(self, ui, args, *opts):
22160 645457f73aa6 alias: keep error message in "badalias" so that help can see it Yuya Nishihara <yuya@tcha.org> parents: 22158 diff changeset	478 if self.badalias:
22164 efd65e51bc0b alias: exit from bad definition by Abort Yuya Nishihara <yuya@tcha.org> parents: 22163 diff changeset	479 hint = None
22161 063628423fd1 alias: provide "unknowncmd" flag to tell help to look for disabled command Yuya Nishihara <yuya@tcha.org> parents: 22160 diff changeset	480 if self.unknowncmd:
10364 de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10282 diff changeset	481 try:
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10282 diff changeset	482 # check if the command is in a disabled extension
22163 01ef4347e4ab alias: show one-line hint for command provided by disabled extension Yuya Nishihara <yuya@tcha.org> parents: 22161 diff changeset	483 cmd, ext = extensions.disabledcmd(ui, self.cmdname)[:2]
22164 efd65e51bc0b alias: exit from bad definition by Abort Yuya Nishihara <yuya@tcha.org> parents: 22163 diff changeset	484 hint = _("'%s' is provided by '%s' extension") % (cmd, ext)
10364 de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10282 diff changeset	485 except error.UnknownCommand:
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10282 diff changeset	486 pass
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26421 diff changeset	487 raise error.Abort(self.badalias, hint=hint)
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	488 if self.shadows:
14704 b24d596fcd25 Backed out changeset 1ec8bd909ac3 Martin Geisler <mg@aragost.com> parents: 14702 diff changeset	489 ui.debug("alias '%s' shadows command '%s'\n" %
12092 4982fa38e544 alias: print what command is being shadowed in debug message Brodie Rao <brodie@bitheap.org> parents: 12070 diff changeset	490 (self.name, self.cmdname))
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	491
14950 144e97421f6b dispatch: use safehasattr instead of hasattr Augie Fackler <durin42@gmail.com> parents: 14918 diff changeset	492 if util.safehasattr(self, 'shell'):
11989 f853873fc66d aliases: provide more flexible ways to work with shell alias arguments Steve Losh <steve@stevelosh.com> parents: 11985 diff changeset	493 return self.fn(ui, args, *opts)
f853873fc66d aliases: provide more flexible ways to work with shell alias arguments Steve Losh <steve@stevelosh.com> parents: 11985 diff changeset	494 else:
12093 cd895084a4cd alias: on --debug, print expansion when it has invalid arguments Brodie Rao <brodie@bitheap.org> parents: 12092 diff changeset	495 try:
21556 5e13507a3b4e alias: fix loss of non-zero return code in command aliases Yuya Nishihara <yuya@tcha.org> parents: 20829 diff changeset	496 return util.checksignature(self.fn)(ui, args, *opts)
12093 cd895084a4cd alias: on --debug, print expansion when it has invalid arguments Brodie Rao <brodie@bitheap.org> parents: 12092 diff changeset	497 except error.SignatureError:
cd895084a4cd alias: on --debug, print expansion when it has invalid arguments Brodie Rao <brodie@bitheap.org> parents: 12092 diff changeset	498 args = ' '.join([self.cmdname] + self.args)
14704 b24d596fcd25 Backed out changeset 1ec8bd909ac3 Martin Geisler <mg@aragost.com> parents: 14702 diff changeset	499 ui.debug("alias '%s' expands to '%s'\n" % (self.name, args))
12093 cd895084a4cd alias: on --debug, print expansion when it has invalid arguments Brodie Rao <brodie@bitheap.org> parents: 12092 diff changeset	500 raise
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	501
21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	502 def addaliases(ui, cmdtable):
21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	503 # aliases are processed after extensions have been loaded, so they
21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	504 # may use extension commands. Aliases can also use other alias definitions,
21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	505 # but only if they have been defined prior to the current definition.
21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	506 for alias, definition in ui.configitems('alias'):
28828 3640c1702c43 help: report source of aliases timeless <timeless@mozdev.org> parents: 28821 diff changeset	507 source = ui.configsource('alias', alias)
3640c1702c43 help: report source of aliases timeless <timeless@mozdev.org> parents: 28821 diff changeset	508 aliasdef = cmdalias(alias, definition, cmdtable, source)
15019 f4b7be3f8430 dispatch: don't rewrap aliases that have the same definition Idan Kamara <idankk86@gmail.com> parents: 14992 diff changeset	509
f4b7be3f8430 dispatch: don't rewrap aliases that have the same definition Idan Kamara <idankk86@gmail.com> parents: 14992 diff changeset	510 try:
f4b7be3f8430 dispatch: don't rewrap aliases that have the same definition Idan Kamara <idankk86@gmail.com> parents: 14992 diff changeset	511 olddef = cmdtable[aliasdef.cmd][0]
f4b7be3f8430 dispatch: don't rewrap aliases that have the same definition Idan Kamara <idankk86@gmail.com> parents: 14992 diff changeset	512 if olddef.definition == aliasdef.definition:
f4b7be3f8430 dispatch: don't rewrap aliases that have the same definition Idan Kamara <idankk86@gmail.com> parents: 14992 diff changeset	513 continue
f4b7be3f8430 dispatch: don't rewrap aliases that have the same definition Idan Kamara <idankk86@gmail.com> parents: 14992 diff changeset	514 except (KeyError, AttributeError):
f4b7be3f8430 dispatch: don't rewrap aliases that have the same definition Idan Kamara <idankk86@gmail.com> parents: 14992 diff changeset	515 # definition might not exist or it might not be a cmdalias
f4b7be3f8430 dispatch: don't rewrap aliases that have the same definition Idan Kamara <idankk86@gmail.com> parents: 14992 diff changeset	516 pass
f4b7be3f8430 dispatch: don't rewrap aliases that have the same definition Idan Kamara <idankk86@gmail.com> parents: 14992 diff changeset	517
15233 81c97964d123 alias: don't shadow commands that we only partially matched (issue2993) (BC) Augie Fackler <durin42@gmail.com> parents: 15027 diff changeset	518 cmdtable[aliasdef.name] = (aliasdef, aliasdef.opts, aliasdef.help)
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	519
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	520 def _parse(ui, args):
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	521 options = {}
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	522 cmdoptions = {}
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	523
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	524 try:
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	525 args = fancyopts.fancyopts(args, commands.globalopts, options)
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25329 diff changeset	526 except fancyopts.getopt.GetoptError as inst:
11287 b901bb751999 error: change ParseError to CommandError Matt Mackall <mpm@selenic.com> parents: 11209 diff changeset	527 raise error.CommandError(None, inst)
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	528
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	529 if args:
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	530 cmd, args = args[0], args[1:]
9875 d6a95c5f6ff9 dispatch: minor refactoring Henri Wiechers <hwiechers@gmail.com> parents: 9825 diff changeset	531 aliases, entry = cmdutil.findcmd(cmd, commands.table,
16591 46e9ed223d2c commands: parse ui.strict config item as bool Yuya Nishihara <yuya@tcha.org> parents: 16392 diff changeset	532 ui.configbool("ui", "strict"))
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	533 cmd = aliases[0]
14265 e4ab5ae193f2 add positional arguments to non-shell aliases Alexander Solovyov <alexander@solovyov.net> parents: 14096 diff changeset	534 args = aliasargs(entry[0], args)
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	535 defaults = ui.config("defaults", cmd)
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	536 if defaults:
9610 d78fe60f6bda make path expanding more consistent Alexander Solovyov <piranha@piranha.org.ua> parents: 9569 diff changeset	537 args = map(util.expandpath, shlex.split(defaults)) + args
9875 d6a95c5f6ff9 dispatch: minor refactoring Henri Wiechers <hwiechers@gmail.com> parents: 9825 diff changeset	538 c = list(entry[1])
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	539 else:
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	540 cmd = None
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	541 c = []
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	542
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	543 # combine global options into local
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	544 for o in commands.globalopts:
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	545 c.append((o[0], o[1], options[o[1]], o[3]))
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	546
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	547 try:
7772 88887054d277 fancyopts: Parse options that occur after arguments. Augie Fackler <durin42@gmail.com> parents: 7733 diff changeset	548 args = fancyopts.fancyopts(args, c, cmdoptions, True)
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25329 diff changeset	549 except fancyopts.getopt.GetoptError as inst:
11287 b901bb751999 error: change ParseError to CommandError Matt Mackall <mpm@selenic.com> parents: 11209 diff changeset	550 raise error.CommandError(cmd, inst)
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	551
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	552 # separate global options back out
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	553 for o in commands.globalopts:
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	554 n = o[1]
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	555 options[n] = cmdoptions[n]
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	556 del cmdoptions[n]
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	557
9875 d6a95c5f6ff9 dispatch: minor refactoring Henri Wiechers <hwiechers@gmail.com> parents: 9825 diff changeset	558 return (cmd, cmd and entry[0] or None, args, options, cmdoptions)
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	559
8137 7fd0616b3d80 ui: kill updateopts Matt Mackall <mpm@selenic.com> parents: 8136 diff changeset	560 def _parseconfig(ui, config):
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	561 """parse the --config options from the command line"""
14753 10dcb3e7cb55 dispatch: return read config options Idan Kamara <idankk86@gmail.com> parents: 14752 diff changeset	562 configs = []
10dcb3e7cb55 dispatch: return read config options Idan Kamara <idankk86@gmail.com> parents: 14752 diff changeset	563
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	564 for cfg in config:
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	565 try:
28081 a6344df5108e dispatch: strip command line options like config file options Tony Tung <ttung@fb.com> parents: 27679 diff changeset	566 name, value = [cfgelem.strip()
a6344df5108e dispatch: strip command line options like config file options Tony Tung <ttung@fb.com> parents: 27679 diff changeset	567 for cfgelem in cfg.split('=', 1)]
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	568 section, name = name.split('.', 1)
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	569 if not section or not name:
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	570 raise IndexError
20788 f144928dd058 config: give a useful hint of source for the most common command line settings Mads Kiilerich <madski@unity3d.com> parents: 20330 diff changeset	571 ui.setconfig(section, name, value, '--config')
14753 10dcb3e7cb55 dispatch: return read config options Idan Kamara <idankk86@gmail.com> parents: 14752 diff changeset	572 configs.append((section, name, value))
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	573 except (IndexError, ValueError):
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26421 diff changeset	574 raise error.Abort(_('malformed --config option: %r '
9825 0d850f8beea6 dispatch: better error message for --config option Bill Schroeder <bschroeder@allstontrading.com> parents: 9679 diff changeset	575 '(use --config section.name=value)') % cfg)
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	576
14753 10dcb3e7cb55 dispatch: return read config options Idan Kamara <idankk86@gmail.com> parents: 14752 diff changeset	577 return configs
10dcb3e7cb55 dispatch: return read config options Idan Kamara <idankk86@gmail.com> parents: 14752 diff changeset	578
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	579 def _earlygetopt(aliases, args):
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	580 """Return list of values for an option (or aliases).
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	581
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	582 The values are listed in the order they appear in args.
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	583 The options and values are removed from args.
19098 f01ae031f84c dispatch: add doctests for _earlygetopt Bryan O'Sullivan <bryano@fb.com> parents: 19011 diff changeset	584
f01ae031f84c dispatch: add doctests for _earlygetopt Bryan O'Sullivan <bryano@fb.com> parents: 19011 diff changeset	585 >>> args = ['x', '--cwd', 'foo', 'y']
f01ae031f84c dispatch: add doctests for _earlygetopt Bryan O'Sullivan <bryano@fb.com> parents: 19011 diff changeset	586 >>> _earlygetopt(['--cwd'], args), args
f01ae031f84c dispatch: add doctests for _earlygetopt Bryan O'Sullivan <bryano@fb.com> parents: 19011 diff changeset	587 (['foo'], ['x', 'y'])
f01ae031f84c dispatch: add doctests for _earlygetopt Bryan O'Sullivan <bryano@fb.com> parents: 19011 diff changeset	588
19099 fc081623f4bd dispatch: add support for --option=value to _earlygetopt Bryan O'Sullivan <bryano@fb.com> parents: 19098 diff changeset	589 >>> args = ['x', '--cwd=bar', 'y']
fc081623f4bd dispatch: add support for --option=value to _earlygetopt Bryan O'Sullivan <bryano@fb.com> parents: 19098 diff changeset	590 >>> _earlygetopt(['--cwd'], args), args
fc081623f4bd dispatch: add support for --option=value to _earlygetopt Bryan O'Sullivan <bryano@fb.com> parents: 19098 diff changeset	591 (['bar'], ['x', 'y'])
fc081623f4bd dispatch: add support for --option=value to _earlygetopt Bryan O'Sullivan <bryano@fb.com> parents: 19098 diff changeset	592
19098 f01ae031f84c dispatch: add doctests for _earlygetopt Bryan O'Sullivan <bryano@fb.com> parents: 19011 diff changeset	593 >>> args = ['x', '-R', 'foo', 'y']
f01ae031f84c dispatch: add doctests for _earlygetopt Bryan O'Sullivan <bryano@fb.com> parents: 19011 diff changeset	594 >>> _earlygetopt(['-R'], args), args
f01ae031f84c dispatch: add doctests for _earlygetopt Bryan O'Sullivan <bryano@fb.com> parents: 19011 diff changeset	595 (['foo'], ['x', 'y'])
f01ae031f84c dispatch: add doctests for _earlygetopt Bryan O'Sullivan <bryano@fb.com> parents: 19011 diff changeset	596
f01ae031f84c dispatch: add doctests for _earlygetopt Bryan O'Sullivan <bryano@fb.com> parents: 19011 diff changeset	597 >>> args = ['x', '-Rbar', 'y']
f01ae031f84c dispatch: add doctests for _earlygetopt Bryan O'Sullivan <bryano@fb.com> parents: 19011 diff changeset	598 >>> _earlygetopt(['-R'], args), args
f01ae031f84c dispatch: add doctests for _earlygetopt Bryan O'Sullivan <bryano@fb.com> parents: 19011 diff changeset	599 (['bar'], ['x', 'y'])
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	600 """
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	601 try:
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	602 argcount = args.index("--")
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	603 except ValueError:
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	604 argcount = len(args)
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	605 shortopts = [opt for opt in aliases if len(opt) == 2]
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	606 values = []
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	607 pos = 0
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	608 while pos < argcount:
19099 fc081623f4bd dispatch: add support for --option=value to _earlygetopt Bryan O'Sullivan <bryano@fb.com> parents: 19098 diff changeset	609 fullarg = arg = args[pos]
fc081623f4bd dispatch: add support for --option=value to _earlygetopt Bryan O'Sullivan <bryano@fb.com> parents: 19098 diff changeset	610 equals = arg.find('=')
fc081623f4bd dispatch: add support for --option=value to _earlygetopt Bryan O'Sullivan <bryano@fb.com> parents: 19098 diff changeset	611 if equals > -1:
fc081623f4bd dispatch: add support for --option=value to _earlygetopt Bryan O'Sullivan <bryano@fb.com> parents: 19098 diff changeset	612 arg = arg[:equals]
fc081623f4bd dispatch: add support for --option=value to _earlygetopt Bryan O'Sullivan <bryano@fb.com> parents: 19098 diff changeset	613 if arg in aliases:
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	614 del args[pos]
19099 fc081623f4bd dispatch: add support for --option=value to _earlygetopt Bryan O'Sullivan <bryano@fb.com> parents: 19098 diff changeset	615 if equals > -1:
fc081623f4bd dispatch: add support for --option=value to _earlygetopt Bryan O'Sullivan <bryano@fb.com> parents: 19098 diff changeset	616 values.append(fullarg[equals + 1:])
fc081623f4bd dispatch: add support for --option=value to _earlygetopt Bryan O'Sullivan <bryano@fb.com> parents: 19098 diff changeset	617 argcount -= 1
fc081623f4bd dispatch: add support for --option=value to _earlygetopt Bryan O'Sullivan <bryano@fb.com> parents: 19098 diff changeset	618 else:
fc081623f4bd dispatch: add support for --option=value to _earlygetopt Bryan O'Sullivan <bryano@fb.com> parents: 19098 diff changeset	619 if pos + 1 >= argcount:
fc081623f4bd dispatch: add support for --option=value to _earlygetopt Bryan O'Sullivan <bryano@fb.com> parents: 19098 diff changeset	620 # ignore and let getopt report an error if there is no value
fc081623f4bd dispatch: add support for --option=value to _earlygetopt Bryan O'Sullivan <bryano@fb.com> parents: 19098 diff changeset	621 break
fc081623f4bd dispatch: add support for --option=value to _earlygetopt Bryan O'Sullivan <bryano@fb.com> parents: 19098 diff changeset	622 values.append(args.pop(pos))
fc081623f4bd dispatch: add support for --option=value to _earlygetopt Bryan O'Sullivan <bryano@fb.com> parents: 19098 diff changeset	623 argcount -= 2
fc081623f4bd dispatch: add support for --option=value to _earlygetopt Bryan O'Sullivan <bryano@fb.com> parents: 19098 diff changeset	624 elif arg[:2] in shortopts:
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	625 # short option can have no following space, e.g. hg log -Rfoo
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	626 values.append(args.pop(pos)[2:])
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	627 argcount -= 1
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	628 else:
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	629 pos += 1
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	630 return values
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	631
11330 713ae78bb583 provide pre- and post- hooks with parsed command line arguments. Chad Dombrova <chadrik@gmail.com> parents: 11305 diff changeset	632 def runcommand(lui, repo, cmd, fullargs, ui, options, d, cmdpats, cmdoptions):
7819 14b703252f14 dispatch: extract command execution block into method Bill Barry <after.fallout@gmail.com> parents: 7772 diff changeset	633 # run pre-hook, and abort if it fails
19011 12acbea17625 dispatch: print 'abort:' when a pre-command hook fails (BC) Siddharth Agarwal <sid0@fb.com> parents: 18935 diff changeset	634 hook.hook(lui, repo, "pre-%s" % cmd, True, args=" ".join(fullargs),
12acbea17625 dispatch: print 'abort:' when a pre-command hook fails (BC) Siddharth Agarwal <sid0@fb.com> parents: 18935 diff changeset	635 pats=cmdpats, opts=cmdoptions)
29129 e6dfb0e4eeef dispatch: add fail-* family of hooks Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 29114 diff changeset	636 try:
e6dfb0e4eeef dispatch: add fail-* family of hooks Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 29114 diff changeset	637 ret = _runcommand(ui, options, cmd, d)
e6dfb0e4eeef dispatch: add fail-* family of hooks Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 29114 diff changeset	638 # run post-hook, passing command result
e6dfb0e4eeef dispatch: add fail-* family of hooks Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 29114 diff changeset	639 hook.hook(lui, repo, "post-%s" % cmd, False, args=" ".join(fullargs),
e6dfb0e4eeef dispatch: add fail-* family of hooks Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 29114 diff changeset	640 result=ret, pats=cmdpats, opts=cmdoptions)
e6dfb0e4eeef dispatch: add fail-* family of hooks Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 29114 diff changeset	641 except Exception:
e6dfb0e4eeef dispatch: add fail-* family of hooks Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 29114 diff changeset	642 # run failure hook and re-raise
e6dfb0e4eeef dispatch: add fail-* family of hooks Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 29114 diff changeset	643 hook.hook(lui, repo, "fail-%s" % cmd, False, args=" ".join(fullargs),
e6dfb0e4eeef dispatch: add fail-* family of hooks Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 29114 diff changeset	644 pats=cmdpats, opts=cmdoptions)
e6dfb0e4eeef dispatch: add fail-* family of hooks Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 29114 diff changeset	645 raise
7819 14b703252f14 dispatch: extract command execution block into method Bill Barry <after.fallout@gmail.com> parents: 7772 diff changeset	646 return ret
14b703252f14 dispatch: extract command execution block into method Bill Barry <after.fallout@gmail.com> parents: 7772 diff changeset	647
28263 59509c6724c7 dispatch: add wd parameter to _getlocal Jun Wu <quark@fb.com> parents: 28081 diff changeset	648 def _getlocal(ui, rpath, wd=None):
12536 208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	649 """Return (path, local ui object) for the given target path.
12770 614f0d8724ab check-code: find trailing whitespace Martin Geisler <mg@lazybytes.net> parents: 12748 diff changeset	650
12536 208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	651 Takes paths in [cwd]/.hg/hgrc into account."
208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	652 """
28263 59509c6724c7 dispatch: add wd parameter to _getlocal Jun Wu <quark@fb.com> parents: 28081 diff changeset	653 if wd is None:
59509c6724c7 dispatch: add wd parameter to _getlocal Jun Wu <quark@fb.com> parents: 28081 diff changeset	654 try:
59509c6724c7 dispatch: add wd parameter to _getlocal Jun Wu <quark@fb.com> parents: 28081 diff changeset	655 wd = os.getcwd()
59509c6724c7 dispatch: add wd parameter to _getlocal Jun Wu <quark@fb.com> parents: 28081 diff changeset	656 except OSError as e:
59509c6724c7 dispatch: add wd parameter to _getlocal Jun Wu <quark@fb.com> parents: 28081 diff changeset	657 raise error.Abort(_("error getting current working directory: %s") %
59509c6724c7 dispatch: add wd parameter to _getlocal Jun Wu <quark@fb.com> parents: 28081 diff changeset	658 e.strerror)
11675 f92f8921a5cc dispatch: give better error message when cwd doesn't exist (issue2293) Mads Kiilerich <mads@kiilerich.com> parents: 11600 diff changeset	659 path = cmdutil.findrepo(wd) or ""
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	660 if not path:
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	661 lui = ui
9436 96379c93ba6f improve code readability Andrey Somov <py4fun@gmail.com> parents: 9411 diff changeset	662 else:
12636 c24215aa7e69 dispatch: remove superfluous try/except when reading local ui config Brodie Rao <brodie@bitheap.org> parents: 12633 diff changeset	663 lui = ui.copy()
12637 42ca7aef28d3 dispatch: properly handle relative path aliases used with -R (issue2376) Brodie Rao <brodie@bitheap.org> parents: 12636 diff changeset	664 lui.readconfig(os.path.join(path, ".hg", "hgrc"), path)
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	665
14860 67add0f24f83 dispatch: fix checking of rpath in _getlocal Matt Mackall <mpm@selenic.com> parents: 14761 diff changeset	666 if rpath and rpath[-1]:
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	667 path = lui.expandpath(rpath[-1])
8190 9b8ac5fb7760 ui: kill most users of parentui name and arg, replace with .copy() Matt Mackall <mpm@selenic.com> parents: 8144 diff changeset	668 lui = ui.copy()
12637 42ca7aef28d3 dispatch: properly handle relative path aliases used with -R (issue2376) Brodie Rao <brodie@bitheap.org> parents: 12636 diff changeset	669 lui.readconfig(os.path.join(path, ".hg", "hgrc"), path)
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	670
12536 208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	671 return path, lui
208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	672
29132 12769703d4ba dispatch: always load extensions before running shell aliases (issue5230) Jun Wu <quark@fb.com> parents: 29129 diff changeset	673 def _checkshellalias(lui, ui, args):
12769703d4ba dispatch: always load extensions before running shell aliases (issue5230) Jun Wu <quark@fb.com> parents: 29129 diff changeset	674 """Return the function to run the shell alias, if it is required"""
12536 208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	675 options = {}
12748 d10369fefd01 alias: fail gracefully when invalid global options are given (issue2442) Steve Losh <steve@stevelosh.com> parents: 12637 diff changeset	676
d10369fefd01 alias: fail gracefully when invalid global options are given (issue2442) Steve Losh <steve@stevelosh.com> parents: 12637 diff changeset	677 try:
d10369fefd01 alias: fail gracefully when invalid global options are given (issue2442) Steve Losh <steve@stevelosh.com> parents: 12637 diff changeset	678 args = fancyopts.fancyopts(args, commands.globalopts, options)
d10369fefd01 alias: fail gracefully when invalid global options are given (issue2442) Steve Losh <steve@stevelosh.com> parents: 12637 diff changeset	679 except fancyopts.getopt.GetoptError:
d10369fefd01 alias: fail gracefully when invalid global options are given (issue2442) Steve Losh <steve@stevelosh.com> parents: 12637 diff changeset	680 return
12536 208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	681
208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	682 if not args:
208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	683 return
208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	684
29132 12769703d4ba dispatch: always load extensions before running shell aliases (issue5230) Jun Wu <quark@fb.com> parents: 29129 diff changeset	685 cmdtable = commands.table
12536 208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	686
208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	687 cmd = args[0]
208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	688 try:
29132 12769703d4ba dispatch: always load extensions before running shell aliases (issue5230) Jun Wu <quark@fb.com> parents: 29129 diff changeset	689 strict = ui.configbool("ui", "strict")
22377 f98abe3146b2 dispatch: check shell alias again after loading extensions (issue4355) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22376 diff changeset	690 aliases, entry = cmdutil.findcmd(cmd, cmdtable, strict)
12932 ab93029ab622 alias: fall back to normal error handling for ambigious commands (fixes issue2475) Steve Losh <steve@stevelosh.com> parents: 12831 diff changeset	691 except (error.AmbiguousCommand, error.UnknownCommand):
12536 208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	692 return
208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	693
208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	694 cmd = aliases[0]
208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	695 fn = entry[0]
208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	696
14950 144e97421f6b dispatch: use safehasattr instead of hasattr Augie Fackler <durin42@gmail.com> parents: 14918 diff changeset	697 if cmd and util.safehasattr(fn, 'shell'):
12536 208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	698 d = lambda: fn(ui, *args[1:])
16683 525fdb738975 cleanup: eradicate long lines Brodie Rao <brodie@sf.io> parents: 16609 diff changeset	699 return lambda: runcommand(lui, None, cmd, args[:1], ui, options, d,
525fdb738975 cleanup: eradicate long lines Brodie Rao <brodie@sf.io> parents: 16609 diff changeset	700 [], {})
12536 208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	701
28622 527cf881d000 dispatch: extract function that tests command attributes Yuya Nishihara <yuya@tcha.org> parents: 28621 diff changeset	702 def _cmdattr(ui, cmd, func, attr):
28623 38dc3f28f478 dispatch: show deprecation warning if command has no attributes (issue5137) Yuya Nishihara <yuya@tcha.org> parents: 28622 diff changeset	703 try:
38dc3f28f478 dispatch: show deprecation warning if command has no attributes (issue5137) Yuya Nishihara <yuya@tcha.org> parents: 28622 diff changeset	704 return getattr(func, attr)
38dc3f28f478 dispatch: show deprecation warning if command has no attributes (issue5137) Yuya Nishihara <yuya@tcha.org> parents: 28622 diff changeset	705 except AttributeError:
38dc3f28f478 dispatch: show deprecation warning if command has no attributes (issue5137) Yuya Nishihara <yuya@tcha.org> parents: 28622 diff changeset	706 ui.deprecwarn("missing attribute '%s', use @command decorator "
38dc3f28f478 dispatch: show deprecation warning if command has no attributes (issue5137) Yuya Nishihara <yuya@tcha.org> parents: 28622 diff changeset	707 "to register '%s'" % (attr, cmd), '3.8')
38dc3f28f478 dispatch: show deprecation warning if command has no attributes (issue5137) Yuya Nishihara <yuya@tcha.org> parents: 28622 diff changeset	708 return False
28622 527cf881d000 dispatch: extract function that tests command attributes Yuya Nishihara <yuya@tcha.org> parents: 28621 diff changeset	709
12536 208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	710 _loaded = set()
28391 73905484ef70 dispatch: make loading extra information from extension extensible FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28313 diff changeset	711
73905484ef70 dispatch: make loading extra information from extension extensible FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28313 diff changeset	712 # list of (objname, loadermod, loadername) tuple:
73905484ef70 dispatch: make loading extra information from extension extensible FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28313 diff changeset	713 # - objname is the name of an object in extension module, from which
73905484ef70 dispatch: make loading extra information from extension extensible FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28313 diff changeset	714 # extra information is loaded
73905484ef70 dispatch: make loading extra information from extension extensible FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28313 diff changeset	715 # - loadermod is the module where loader is placed
73905484ef70 dispatch: make loading extra information from extension extensible FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28313 diff changeset	716 # - loadername is the name of the function, which takes (ui, extensionname,
73905484ef70 dispatch: make loading extra information from extension extensible FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28313 diff changeset	717 # extraobj) arguments
73905484ef70 dispatch: make loading extra information from extension extensible FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28313 diff changeset	718 extraloaders = [
73905484ef70 dispatch: make loading extra information from extension extensible FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28313 diff changeset	719 ('cmdtable', commands, 'loadcmdtable'),
28447 4eb5496c2bd4 registrar: add filesetpredicate to mark a function as fileset predicate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28394 diff changeset	720 ('filesetpredicate', fileset, 'loadpredicate'),
28394 dcb4209bd30d revset: replace extpredicate by revsetpredicate of registrar FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28391 diff changeset	721 ('revsetpredicate', revset, 'loadpredicate'),
28692 6b3b958daf03 registrar: add templatefilter to mark a function as template filter (API) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28623 diff changeset	722 ('templatefilter', templatefilters, 'loadfilter'),
28695 cc103bd0dbf9 registrar: add templatefunc to mark a function as template function (API) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28692 diff changeset	723 ('templatefunc', templater, 'loadfunction'),
28538 009f58f1ea75 registrar: add templatekeyword to mark a function as template keyword (API) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28534 diff changeset	724 ('templatekeyword', templatekw, 'loadkeyword'),
28391 73905484ef70 dispatch: make loading extra information from extension extensible FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28313 diff changeset	725 ]
73905484ef70 dispatch: make loading extra information from extension extensible FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28313 diff changeset	726
14439 80c599eee3f3 dispatch: use the request to store the ui object Idan Kamara <idankk86@gmail.com> parents: 14438 diff changeset	727 def _dispatch(req):
14438 08bfec2ef031 dispatch: wrap dispatch related information in a request class Idan Kamara <idankk86@gmail.com> parents: 14286 diff changeset	728 args = req.args
14439 80c599eee3f3 dispatch: use the request to store the ui object Idan Kamara <idankk86@gmail.com> parents: 14438 diff changeset	729 ui = req.ui
80c599eee3f3 dispatch: use the request to store the ui object Idan Kamara <idankk86@gmail.com> parents: 14438 diff changeset	730
12536 208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	731 # check for cwd
208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	732 cwd = _earlygetopt(['--cwd'], args)
208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	733 if cwd:
208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	734 os.chdir(cwd[-1])
208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	735
208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	736 rpath = _earlygetopt(["-R", "--repository", "--repo"], args)
208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	737 path, lui = _getlocal(ui, rpath)
208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	738
9410 1c83938b6a8e extensions: load and configure extensions in well-defined phases Martin Geisler <mg@lazybytes.net> parents: 8936 diff changeset	739 # Configure extensions in phases: uisetup, extsetup, cmdtable, and
1c83938b6a8e extensions: load and configure extensions in well-defined phases Martin Geisler <mg@lazybytes.net> parents: 8936 diff changeset	740 # reposetup. Programs like TortoiseHg will call _dispatch several
1c83938b6a8e extensions: load and configure extensions in well-defined phases Martin Geisler <mg@lazybytes.net> parents: 8936 diff changeset	741 # times so we keep track of configured extensions in _loaded.
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	742 extensions.loadall(lui)
9410 1c83938b6a8e extensions: load and configure extensions in well-defined phases Martin Geisler <mg@lazybytes.net> parents: 8936 diff changeset	743 exts = [ext for ext in extensions.extensions() if ext[0] not in _loaded]
11555 d8d0fc3988ca color/progress: subclass ui instead of using wrapfunction (issue2096) Brodie Rao <brodie@bitheap.org> parents: 11330 diff changeset	744 # Propagate any changes to lui.__class__ by extensions
d8d0fc3988ca color/progress: subclass ui instead of using wrapfunction (issue2096) Brodie Rao <brodie@bitheap.org> parents: 11330 diff changeset	745 ui.__class__ = lui.__class__
5828 863e237b58fb dispatch: allow extensions to provide setup code Kirill Smelkov <kirr@mns.spb.ru> parents: 5664 diff changeset	746
9660 e0eae93e6c67 extensions: changed to call extsetup() from extensions.loadall() Yuya Nishihara <yuya@tcha.org> parents: 9610 diff changeset	747 # (uisetup and extsetup are handled in extensions.loadall)
5828 863e237b58fb dispatch: allow extensions to provide setup code Kirill Smelkov <kirr@mns.spb.ru> parents: 5664 diff changeset	748
9410 1c83938b6a8e extensions: load and configure extensions in well-defined phases Martin Geisler <mg@lazybytes.net> parents: 8936 diff changeset	749 for name, module in exts:
28391 73905484ef70 dispatch: make loading extra information from extension extensible FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28313 diff changeset	750 for objname, loadermod, loadername in extraloaders:
73905484ef70 dispatch: make loading extra information from extension extensible FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28313 diff changeset	751 extraobj = getattr(module, objname, None)
73905484ef70 dispatch: make loading extra information from extension extensible FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28313 diff changeset	752 if extraobj is not None:
73905484ef70 dispatch: make loading extra information from extension extensible FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28313 diff changeset	753 getattr(loadermod, loadername)(ui, name, extraobj)
8304 991ca609ccd6 dispatch: remember loaded extensions in a real set Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	754 _loaded.add(name)
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	755
9410 1c83938b6a8e extensions: load and configure extensions in well-defined phases Martin Geisler <mg@lazybytes.net> parents: 8936 diff changeset	756 # (reposetup is handled in hg.repository)
1c83938b6a8e extensions: load and configure extensions in well-defined phases Martin Geisler <mg@lazybytes.net> parents: 8936 diff changeset	757
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	758 addaliases(lui, commands.table)
21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	759
29132 12769703d4ba dispatch: always load extensions before running shell aliases (issue5230) Jun Wu <quark@fb.com> parents: 29129 diff changeset	760 # All aliases and commands are completely defined, now.
12769703d4ba dispatch: always load extensions before running shell aliases (issue5230) Jun Wu <quark@fb.com> parents: 29129 diff changeset	761 # Check abbreviation/ambiguity of shell alias.
12769703d4ba dispatch: always load extensions before running shell aliases (issue5230) Jun Wu <quark@fb.com> parents: 29129 diff changeset	762 shellaliasfn = _checkshellalias(lui, ui, args)
12769703d4ba dispatch: always load extensions before running shell aliases (issue5230) Jun Wu <quark@fb.com> parents: 29129 diff changeset	763 if shellaliasfn:
12769703d4ba dispatch: always load extensions before running shell aliases (issue5230) Jun Wu <quark@fb.com> parents: 29129 diff changeset	764 return shellaliasfn()
22377 f98abe3146b2 dispatch: check shell alias again after loading extensions (issue4355) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22376 diff changeset	765
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	766 # check for fallback encoding
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	767 fallback = lui.config('ui', 'fallbackencoding')
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	768 if fallback:
7948 de377b1a9a84 move encoding bits from util to encoding Matt Mackall <mpm@selenic.com> parents: 7873 diff changeset	769 encoding.fallbackencoding = fallback
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	770
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	771 fullargs = args
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	772 cmd, func, args, options, cmdoptions = _parse(lui, args)
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	773
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	774 if options["config"]:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26421 diff changeset	775 raise error.Abort(_("option --config may not be abbreviated!"))
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	776 if options["cwd"]:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26421 diff changeset	777 raise error.Abort(_("option --cwd may not be abbreviated!"))
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	778 if options["repository"]:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26421 diff changeset	779 raise error.Abort(_(
15781 cc2da4a5ed9a dispatch: lowercase abort message Martin Geisler <mg@aragost.com> parents: 15632 diff changeset	780 "option -R has to be separated from other options (e.g. not -qR) "
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	781 "and --repository may only be abbreviated as --repo!"))
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	782
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	783 if options["encoding"]:
7948 de377b1a9a84 move encoding bits from util to encoding Matt Mackall <mpm@selenic.com> parents: 7873 diff changeset	784 encoding.encoding = options["encoding"]
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	785 if options["encodingmode"]:
7948 de377b1a9a84 move encoding bits from util to encoding Matt Mackall <mpm@selenic.com> parents: 7873 diff changeset	786 encoding.encodingmode = options["encodingmode"]
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	787 if options["time"]:
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	788 def get_times():
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	789 t = os.times()
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	790 if t[4] == 0.0: # Windows leaves this as zero, so use time.clock()
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	791 t = (t[0], t[1], t[2], t[3], time.clock())
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	792 return t
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	793 s = get_times()
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	794 def print_time():
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	795 t = get_times()
16933 30143c3dd102 dispatch: lowercase --time message Martin Geisler <mg@aragost.com> parents: 16839 diff changeset	796 ui.warn(_("time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n") %
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	797 (t[4]-s[4], t[0]-s[0], t[2]-s[2], t[1]-s[1], t[3]-s[3]))
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	798 atexit.register(print_time)
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	799
14752 99ace3cb7352 dispatch: set global options on the request repo.ui Idan Kamara <idankk86@gmail.com> parents: 14748 diff changeset	800 uis = set([ui, lui])
99ace3cb7352 dispatch: set global options on the request repo.ui Idan Kamara <idankk86@gmail.com> parents: 14748 diff changeset	801
99ace3cb7352 dispatch: set global options on the request repo.ui Idan Kamara <idankk86@gmail.com> parents: 14748 diff changeset	802 if req.repo:
99ace3cb7352 dispatch: set global options on the request repo.ui Idan Kamara <idankk86@gmail.com> parents: 14748 diff changeset	803 uis.add(req.repo.ui)
99ace3cb7352 dispatch: set global options on the request repo.ui Idan Kamara <idankk86@gmail.com> parents: 14748 diff changeset	804
14992 188936b334b1 dispatch: make sure global options on the command line take precedence Idan Kamara <idankk86@gmail.com> parents: 14914 diff changeset	805 if options['verbose'] or options['debug'] or options['quiet']:
188936b334b1 dispatch: make sure global options on the command line take precedence Idan Kamara <idankk86@gmail.com> parents: 14914 diff changeset	806 for opt in ('verbose', 'debug', 'quiet'):
188936b334b1 dispatch: make sure global options on the command line take precedence Idan Kamara <idankk86@gmail.com> parents: 14914 diff changeset	807 val = str(bool(options[opt]))
14752 99ace3cb7352 dispatch: set global options on the request repo.ui Idan Kamara <idankk86@gmail.com> parents: 14748 diff changeset	808 for ui_ in uis:
20788 f144928dd058 config: give a useful hint of source for the most common command line settings Mads Kiilerich <madski@unity3d.com> parents: 20330 diff changeset	809 ui_.setconfig('ui', opt, val, '--' + opt)
14992 188936b334b1 dispatch: make sure global options on the command line take precedence Idan Kamara <idankk86@gmail.com> parents: 14914 diff changeset	810
188936b334b1 dispatch: make sure global options on the command line take precedence Idan Kamara <idankk86@gmail.com> parents: 14914 diff changeset	811 if options['traceback']:
188936b334b1 dispatch: make sure global options on the command line take precedence Idan Kamara <idankk86@gmail.com> parents: 14914 diff changeset	812 for ui_ in uis:
20788 f144928dd058 config: give a useful hint of source for the most common command line settings Mads Kiilerich <madski@unity3d.com> parents: 20330 diff changeset	813 ui_.setconfig('ui', 'traceback', 'on', '--traceback')
14748 1b8c70c9f47c dispatch: make sure unspecified global ui options don't override old values Idan Kamara <idankk86@gmail.com> parents: 14744 diff changeset	814
8136 6b5522cb2ad2 ui: refactor option setting Matt Mackall <mpm@selenic.com> parents: 8024 diff changeset	815 if options['noninteractive']:
14752 99ace3cb7352 dispatch: set global options on the request repo.ui Idan Kamara <idankk86@gmail.com> parents: 14748 diff changeset	816 for ui_ in uis:
20788 f144928dd058 config: give a useful hint of source for the most common command line settings Mads Kiilerich <madski@unity3d.com> parents: 20330 diff changeset	817 ui_.setconfig('ui', 'interactive', 'off', '-y')
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	818
13328 a939f08fae9c url: add --insecure option to bypass verification of ssl certificates Yuya Nishihara <yuya@tcha.org> parents: 12932 diff changeset	819 if cmdoptions.get('insecure', False):
14752 99ace3cb7352 dispatch: set global options on the request repo.ui Idan Kamara <idankk86@gmail.com> parents: 14748 diff changeset	820 for ui_ in uis:
29110 b197e2aba703 dispatch: set ui.insecureconnections when --insecure is used Gregory Szorc <gregory.szorc@gmail.com> parents: 29087 diff changeset	821 ui_.insecureconnections = True
13328 a939f08fae9c url: add --insecure option to bypass verification of ssl certificates Yuya Nishihara <yuya@tcha.org> parents: 12932 diff changeset	822
15020 607f1434501d help: drop with_version Matt Mackall <mpm@selenic.com> parents: 15017 diff changeset	823 if options['version']:
607f1434501d help: drop with_version Matt Mackall <mpm@selenic.com> parents: 15017 diff changeset	824 return commands.version_(ui)
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	825 if options['help']:
27325 eadbbd14bdc1 help: fix help -c/help -e/help -k timeless <timeless@mozdev.org> parents: 27113 diff changeset	826 return commands.help_(ui, cmd, command=cmd is not None)
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	827 elif not cmd:
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	828 return commands.help_(ui, 'shortlist')
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	829
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	830 repo = None
11330 713ae78bb583 provide pre- and post- hooks with parsed command line arguments. Chad Dombrova <chadrik@gmail.com> parents: 11305 diff changeset	831 cmdpats = args[:]
28622 527cf881d000 dispatch: extract function that tests command attributes Yuya Nishihara <yuya@tcha.org> parents: 28621 diff changeset	832 if not _cmdattr(ui, cmd, func, 'norepo'):
14510 eccbb9980ada dispatch: add repo to the request Idan Kamara <idankk86@gmail.com> parents: 14439 diff changeset	833 # use the repo from the request only if we don't have -R
14863 1c148e935244 dispatch: don't use request repo if we have --cwd Idan Kamara <idankk86@gmail.com> parents: 14761 diff changeset	834 if not rpath and not cwd:
14510 eccbb9980ada dispatch: add repo to the request Idan Kamara <idankk86@gmail.com> parents: 14439 diff changeset	835 repo = req.repo
eccbb9980ada dispatch: add repo to the request Idan Kamara <idankk86@gmail.com> parents: 14439 diff changeset	836
14744 23325c5ef6a7 dispatch: set descriptors on the request repo.ui Idan Kamara <idankk86@gmail.com> parents: 14743 diff changeset	837 if repo:
23325c5ef6a7 dispatch: set descriptors on the request repo.ui Idan Kamara <idankk86@gmail.com> parents: 14743 diff changeset	838 # set the descriptors of the repo ui to those of ui
23325c5ef6a7 dispatch: set descriptors on the request repo.ui Idan Kamara <idankk86@gmail.com> parents: 14743 diff changeset	839 repo.ui.fin = ui.fin
23325c5ef6a7 dispatch: set descriptors on the request repo.ui Idan Kamara <idankk86@gmail.com> parents: 14743 diff changeset	840 repo.ui.fout = ui.fout
23325c5ef6a7 dispatch: set descriptors on the request repo.ui Idan Kamara <idankk86@gmail.com> parents: 14743 diff changeset	841 repo.ui.ferr = ui.ferr
23325c5ef6a7 dispatch: set descriptors on the request repo.ui Idan Kamara <idankk86@gmail.com> parents: 14743 diff changeset	842 else:
14510 eccbb9980ada dispatch: add repo to the request Idan Kamara <idankk86@gmail.com> parents: 14439 diff changeset	843 try:
eccbb9980ada dispatch: add repo to the request Idan Kamara <idankk86@gmail.com> parents: 14439 diff changeset	844 repo = hg.repository(ui, path=path)
eccbb9980ada dispatch: add repo to the request Idan Kamara <idankk86@gmail.com> parents: 14439 diff changeset	845 if not repo.local():
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26421 diff changeset	846 raise error.Abort(_("repository '%s' is not local") % path)
20788 f144928dd058 config: give a useful hint of source for the most common command line settings Mads Kiilerich <madski@unity3d.com> parents: 20330 diff changeset	847 repo.ui.setconfig("bundle", "mainreporoot", repo.root, 'repo')
14510 eccbb9980ada dispatch: add repo to the request Idan Kamara <idankk86@gmail.com> parents: 14439 diff changeset	848 except error.RequirementError:
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	849 raise
14510 eccbb9980ada dispatch: add repo to the request Idan Kamara <idankk86@gmail.com> parents: 14439 diff changeset	850 except error.RepoError:
26142 7332bf4ae959 dispatch: error out on invalid -R path even if optionalrepo (issue4805) (BC) Yuya Nishihara <yuya@tcha.org> parents: 25932 diff changeset	851 if rpath and rpath[-1]: # invalid -R path
7332bf4ae959 dispatch: error out on invalid -R path even if optionalrepo (issue4805) (BC) Yuya Nishihara <yuya@tcha.org> parents: 25932 diff changeset	852 raise
28622 527cf881d000 dispatch: extract function that tests command attributes Yuya Nishihara <yuya@tcha.org> parents: 28621 diff changeset	853 if not _cmdattr(ui, cmd, func, 'optionalrepo'):
527cf881d000 dispatch: extract function that tests command attributes Yuya Nishihara <yuya@tcha.org> parents: 28621 diff changeset	854 if (_cmdattr(ui, cmd, func, 'inferrepo') and
527cf881d000 dispatch: extract function that tests command attributes Yuya Nishihara <yuya@tcha.org> parents: 28621 diff changeset	855 args and not path):
28313 aa73d6a5d9ea dispatch: store norepo/optionalrepo/inferrepo attributes in function (API) Yuya Nishihara <yuya@tcha.org> parents: 28263 diff changeset	856 # try to infer -R from command args
14510 eccbb9980ada dispatch: add repo to the request Idan Kamara <idankk86@gmail.com> parents: 14439 diff changeset	857 repos = map(cmdutil.findrepo, args)
eccbb9980ada dispatch: add repo to the request Idan Kamara <idankk86@gmail.com> parents: 14439 diff changeset	858 guess = repos[0]
eccbb9980ada dispatch: add repo to the request Idan Kamara <idankk86@gmail.com> parents: 14439 diff changeset	859 if guess and repos.count(guess) == len(repos):
eccbb9980ada dispatch: add repo to the request Idan Kamara <idankk86@gmail.com> parents: 14439 diff changeset	860 req.args = ['--repository', guess] + fullargs
eccbb9980ada dispatch: add repo to the request Idan Kamara <idankk86@gmail.com> parents: 14439 diff changeset	861 return _dispatch(req)
eccbb9980ada dispatch: add repo to the request Idan Kamara <idankk86@gmail.com> parents: 14439 diff changeset	862 if not path:
14914 41c3a71c318d dispatch: avoid double backslashes in error message David Golub <davidg@fogcreek.com> parents: 14863 diff changeset	863 raise error.RepoError(_("no repository found in '%s'"
16683 525fdb738975 cleanup: eradicate long lines Brodie Rao <brodie@sf.io> parents: 16609 diff changeset	864 " (.hg not found)")
525fdb738975 cleanup: eradicate long lines Brodie Rao <brodie@sf.io> parents: 16609 diff changeset	865 % os.getcwd())
14510 eccbb9980ada dispatch: add repo to the request Idan Kamara <idankk86@gmail.com> parents: 14439 diff changeset	866 raise
14743 84a680daa4b2 dispatch: pass the correct ui to runcommand Idan Kamara <idankk86@gmail.com> parents: 14727 diff changeset	867 if repo:
84a680daa4b2 dispatch: pass the correct ui to runcommand Idan Kamara <idankk86@gmail.com> parents: 14727 diff changeset	868 ui = repo.ui
20330 69a0d22b9677 dispatch: take --hidden from individual commands into account Julien Cristau <julien.cristau@logilab.fr> parents: 20328 diff changeset	869 if options['hidden']:
69a0d22b9677 dispatch: take --hidden from individual commands into account Julien Cristau <julien.cristau@logilab.fr> parents: 20328 diff changeset	870 repo = repo.unfiltered()
7388 5751631246de dispatch: generalize signature checking for extension command wrapping Matt Mackall <mpm@selenic.com> parents: 7280 diff changeset	871 args.insert(0, repo)
7733 30e95eafc1d0 warn if --repository provided for norepo commands Matt Mackall <mpm@selenic.com> parents: 7646 diff changeset	872 elif rpath:
11600 76454cbc11e4 mark ui.warn strings for translation Martin Geisler <mg@lazybytes.net> parents: 11555 diff changeset	873 ui.warn(_("warning: --repository ignored\n"))
7388 5751631246de dispatch: generalize signature checking for extension command wrapping Matt Mackall <mpm@selenic.com> parents: 7280 diff changeset	874
11985 81edef14922e log: add logging for commands Matt Mackall <mpm@selenic.com> parents: 11714 diff changeset	875 msg = ' '.join(' ' in a and repr(a) or a for a in fullargs)
18758 6aca4d1c744e blackbox: fix exception when logging commands with format characters Durham Goode <durham@fb.com> parents: 18693 diff changeset	876 ui.log("command", '%s\n', msg)
7388 5751631246de dispatch: generalize signature checking for extension command wrapping Matt Mackall <mpm@selenic.com> parents: 7280 diff changeset	877 d = lambda: util.checksignature(func)(ui, args, *cmdoptions)
13382 d747774ca9da Make sure bundlerepo doesn't leak temp files (issue2491) Adrian Buehlmann <adrian@cadifra.com> parents: 13328 diff changeset	878 try:
19229 41e39a0299cb blackbox: fix recording exit codes (issue3938) Durham Goode <durham@fb.com> parents: 19099 diff changeset	879 return runcommand(lui, repo, cmd, fullargs, ui, options, d,
41e39a0299cb blackbox: fix recording exit codes (issue3938) Durham Goode <durham@fb.com> parents: 19099 diff changeset	880 cmdpats, cmdoptions)
13382 d747774ca9da Make sure bundlerepo doesn't leak temp files (issue2491) Adrian Buehlmann <adrian@cadifra.com> parents: 13328 diff changeset	881 finally:
14727 d4b9d3b91ce7 dispatch: check for None before closing repo Idan Kamara <idankk86@gmail.com> parents: 14712 diff changeset	882 if repo and repo != req.repo:
13382 d747774ca9da Make sure bundlerepo doesn't leak temp files (issue2491) Adrian Buehlmann <adrian@cadifra.com> parents: 13328 diff changeset	883 repo.close()
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	884
16392 ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	885 def lsprofile(ui, func, fp):
ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	886 format = ui.config('profiling', 'format', default='text')
ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	887 field = ui.config('profiling', 'sort', default='inlinetime')
18548 e71c2ff93167 profiling: introduce limit configuration option Mads Kiilerich <madski@unity3d.com> parents: 18303 diff changeset	888 limit = ui.configint('profiling', 'limit', default=30)
25277 0f2dcbccf9c9 profile: disable nested report in lsprof by default Matt Mackall <mpm@selenic.com> parents: 25242 diff changeset	889 climit = ui.configint('profiling', 'nested', default=0)
16392 ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	890
16686 67964cda8701 cleanup: "not x in y" -> "x not in y" Brodie Rao <brodie@sf.io> parents: 16683 diff changeset	891 if format not in ['text', 'kcachegrind']:
16392 ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	892 ui.warn(_("unrecognized profiling format '%s'"
ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	893 " - Ignored\n") % format)
ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	894 format = 'text'
ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	895
ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	896 try:
25932 d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	897 from . import lsprof
16392 ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	898 except ImportError:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26421 diff changeset	899 raise error.Abort(_(
16392 ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	900 'lsprof not available - install from '
ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	901 'http://codespeak.net/svn/user/arigo/hack/misc/lsprof/'))
ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	902 p = lsprof.Profiler()
ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	903 p.enable(subcalls=True)
ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	904 try:
ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	905 return func()
ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	906 finally:
ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	907 p.disable()
ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	908
ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	909 if format == 'kcachegrind':
25932 d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	910 from . import lsprofcalltree
16392 ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	911 calltree = lsprofcalltree.KCacheGrind(p)
ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	912 calltree.output(fp)
ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	913 else:
ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	914 # format == 'text'
ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	915 stats = lsprof.Stats(p.getstats())
ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	916 stats.sort(field)
18548 e71c2ff93167 profiling: introduce limit configuration option Mads Kiilerich <madski@unity3d.com> parents: 18303 diff changeset	917 stats.pprint(limit=limit, file=fp, climit=climit)
16392 ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	918
25187 670c1df688fd dispatch: add support for python-flamegraph[0] profiling Augie Fackler <augie@google.com> parents: 24290 diff changeset	919 def flameprofile(ui, func, fp):
670c1df688fd dispatch: add support for python-flamegraph[0] profiling Augie Fackler <augie@google.com> parents: 24290 diff changeset	920 try:
670c1df688fd dispatch: add support for python-flamegraph[0] profiling Augie Fackler <augie@google.com> parents: 24290 diff changeset	921 from flamegraph import flamegraph
670c1df688fd dispatch: add support for python-flamegraph[0] profiling Augie Fackler <augie@google.com> parents: 24290 diff changeset	922 except ImportError:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26421 diff changeset	923 raise error.Abort(_(
25187 670c1df688fd dispatch: add support for python-flamegraph[0] profiling Augie Fackler <augie@google.com> parents: 24290 diff changeset	924 'flamegraph not available - install from '
670c1df688fd dispatch: add support for python-flamegraph[0] profiling Augie Fackler <augie@google.com> parents: 24290 diff changeset	925 'https://github.com/evanhempel/python-flamegraph'))
25834 aca8ae2b0cb2 profiler: mark developer-only config option Matt Mackall <mpm@selenic.com> parents: 25833 diff changeset	926 # developer config: profiling.freq
25187 670c1df688fd dispatch: add support for python-flamegraph[0] profiling Augie Fackler <augie@google.com> parents: 24290 diff changeset	927 freq = ui.configint('profiling', 'freq', default=1000)
670c1df688fd dispatch: add support for python-flamegraph[0] profiling Augie Fackler <augie@google.com> parents: 24290 diff changeset	928 filter_ = None
670c1df688fd dispatch: add support for python-flamegraph[0] profiling Augie Fackler <augie@google.com> parents: 24290 diff changeset	929 collapse_recursion = True
670c1df688fd dispatch: add support for python-flamegraph[0] profiling Augie Fackler <augie@google.com> parents: 24290 diff changeset	930 thread = flamegraph.ProfileThread(fp, 1.0 / freq,
670c1df688fd dispatch: add support for python-flamegraph[0] profiling Augie Fackler <augie@google.com> parents: 24290 diff changeset	931 filter_, collapse_recursion)
670c1df688fd dispatch: add support for python-flamegraph[0] profiling Augie Fackler <augie@google.com> parents: 24290 diff changeset	932 start_time = time.clock()
670c1df688fd dispatch: add support for python-flamegraph[0] profiling Augie Fackler <augie@google.com> parents: 24290 diff changeset	933 try:
670c1df688fd dispatch: add support for python-flamegraph[0] profiling Augie Fackler <augie@google.com> parents: 24290 diff changeset	934 thread.start()
670c1df688fd dispatch: add support for python-flamegraph[0] profiling Augie Fackler <augie@google.com> parents: 24290 diff changeset	935 func()
670c1df688fd dispatch: add support for python-flamegraph[0] profiling Augie Fackler <augie@google.com> parents: 24290 diff changeset	936 finally:
670c1df688fd dispatch: add support for python-flamegraph[0] profiling Augie Fackler <augie@google.com> parents: 24290 diff changeset	937 thread.stop()
670c1df688fd dispatch: add support for python-flamegraph[0] profiling Augie Fackler <augie@google.com> parents: 24290 diff changeset	938 thread.join()
27615 4030d3b79953 dispatch: use print function Gregory Szorc <gregory.szorc@gmail.com> parents: 27516 diff changeset	939 print('Collected %d stack frames (%d unique) in %2.2f seconds.' % (
25187 670c1df688fd dispatch: add support for python-flamegraph[0] profiling Augie Fackler <augie@google.com> parents: 24290 diff changeset	940 time.clock() - start_time, thread.num_frames(),
27615 4030d3b79953 dispatch: use print function Gregory Szorc <gregory.szorc@gmail.com> parents: 27516 diff changeset	941 thread.num_frames(unique=True)))
25187 670c1df688fd dispatch: add support for python-flamegraph[0] profiling Augie Fackler <augie@google.com> parents: 24290 diff changeset	942
670c1df688fd dispatch: add support for python-flamegraph[0] profiling Augie Fackler <augie@google.com> parents: 24290 diff changeset	943
16392 ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	944 def statprofile(ui, func, fp):
ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	945 try:
ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	946 import statprof
ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	947 except ImportError:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26421 diff changeset	948 raise error.Abort(_(
16392 ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	949 'statprof not available - install using "easy_install statprof"'))
ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	950
ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	951 freq = ui.configint('profiling', 'freq', default=1000)
ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	952 if freq > 0:
ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	953 statprof.reset(freq)
ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	954 else:
ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	955 ui.warn(_("invalid sampling frequency '%s' - ignoring\n") % freq)
ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	956
ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	957 statprof.start()
ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	958 try:
ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	959 return func()
ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	960 finally:
ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	961 statprof.stop()
ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	962 statprof.display(fp)
ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	963
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	964 def _runcommand(ui, options, cmd, cmdfunc):
26186 eb2187ebdf8a profiling: add config option for enabling profiling Durham Goode <durham@fb.com> parents: 26142 diff changeset	965 """Enables the profiler if applicable.
eb2187ebdf8a profiling: add config option for enabling profiling Durham Goode <durham@fb.com> parents: 26142 diff changeset	966
eb2187ebdf8a profiling: add config option for enabling profiling Durham Goode <durham@fb.com> parents: 26142 diff changeset	967 ``profiling.enabled`` - boolean config that enables or disables profiling
eb2187ebdf8a profiling: add config option for enabling profiling Durham Goode <durham@fb.com> parents: 26142 diff changeset	968 """
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	969 def checkargs():
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	970 try:
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	971 return cmdfunc()
7646 e62a456b8dc5 error: move SignatureError Matt Mackall <mpm@selenic.com> parents: 7645 diff changeset	972 except error.SignatureError:
11287 b901bb751999 error: change ParseError to CommandError Matt Mackall <mpm@selenic.com> parents: 11209 diff changeset	973 raise error.CommandError(cmd, _("invalid arguments"))
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	974
26186 eb2187ebdf8a profiling: add config option for enabling profiling Durham Goode <durham@fb.com> parents: 26142 diff changeset	975 if options['profile'] or ui.configbool('profiling', 'enabled'):
16392 ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	976 profiler = os.getenv('HGPROF')
ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	977 if profiler is None:
ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	978 profiler = ui.config('profiling', 'type', default='ls')
25187 670c1df688fd dispatch: add support for python-flamegraph[0] profiling Augie Fackler <augie@google.com> parents: 24290 diff changeset	979 if profiler not in ('ls', 'stat', 'flame'):
16392 ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	980 ui.warn(_("unrecognized profiler '%s' - ignored\n") % profiler)
ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	981 profiler = 'ls'
8023 fd9debb3ea1b profiling: Adding a profiling.format config variable Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 8022 diff changeset	982
8022 4f3fdfaa3874 profiling: Adding profiling.output config variable Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 8021 diff changeset	983 output = ui.config('profiling', 'output')
4f3fdfaa3874 profiling: Adding profiling.output config variable Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 8021 diff changeset	984
26191 39a0b11158d8 profiling: allow logging profile to the blackbox Durham Goode <durham@fb.com> parents: 26186 diff changeset	985 if output == 'blackbox':
28861 86db5cb55d46 pycompat: switch to util.stringio for py3 compat timeless <timeless@mozdev.org> parents: 28828 diff changeset	986 fp = util.stringio()
26191 39a0b11158d8 profiling: allow logging profile to the blackbox Durham Goode <durham@fb.com> parents: 26186 diff changeset	987 elif output:
9610 d78fe60f6bda make path expanding more consistent Alexander Solovyov <piranha@piranha.org.ua> parents: 9569 diff changeset	988 path = ui.expandpath(output)
16392 ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	989 fp = open(path, 'wb')
8022 4f3fdfaa3874 profiling: Adding profiling.output config variable Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 8021 diff changeset	990 else:
16392 ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	991 fp = sys.stderr
8022 4f3fdfaa3874 profiling: Adding profiling.output config variable Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 8021 diff changeset	992
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	993 try:
16392 ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	994 if profiler == 'ls':
ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	995 return lsprofile(ui, checkargs, fp)
25187 670c1df688fd dispatch: add support for python-flamegraph[0] profiling Augie Fackler <augie@google.com> parents: 24290 diff changeset	996 elif profiler == 'flame':
670c1df688fd dispatch: add support for python-flamegraph[0] profiling Augie Fackler <augie@google.com> parents: 24290 diff changeset	997 return flameprofile(ui, checkargs, fp)
16392 ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	998 else:
ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	999 return statprofile(ui, checkargs, fp)
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	1000 finally:
8022 4f3fdfaa3874 profiling: Adding profiling.output config variable Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 8021 diff changeset	1001 if output:
26191 39a0b11158d8 profiling: allow logging profile to the blackbox Durham Goode <durham@fb.com> parents: 26186 diff changeset	1002 if output == 'blackbox':
39a0b11158d8 profiling: allow logging profile to the blackbox Durham Goode <durham@fb.com> parents: 26186 diff changeset	1003 val = "Profile:\n%s" % fp.getvalue()
39a0b11158d8 profiling: allow logging profile to the blackbox Durham Goode <durham@fb.com> parents: 26186 diff changeset	1004 # ui.log treats the input as a format string,
39a0b11158d8 profiling: allow logging profile to the blackbox Durham Goode <durham@fb.com> parents: 26186 diff changeset	1005 # so we need to escape any % signs.
39a0b11158d8 profiling: allow logging profile to the blackbox Durham Goode <durham@fb.com> parents: 26186 diff changeset	1006 val = val.replace('%', '%%')
39a0b11158d8 profiling: allow logging profile to the blackbox Durham Goode <durham@fb.com> parents: 26186 diff changeset	1007 ui.log('profile', val)
16392 ee3f423df1b4 dispatch: add support for statprof as a profiler Bryan O'Sullivan <bryano@fb.com> parents: 16295 diff changeset	1008 fp.close()
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	1009 else:
6141 90e5c82a3859 Backed out changeset b913d3aacddc (see issue971/msg5317) Thomas Arendsen Hein <thomas@intevation.de> parents: 5995 diff changeset	1010 return checkargs()
28784 09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1011
28821 d3369dc6c1d0 dispatch: split out warning message generation to separate function Martijn Pieters <mjpieters@fb.com> parents: 28784 diff changeset	1012 def _exceptionwarning(ui):
d3369dc6c1d0 dispatch: split out warning message generation to separate function Martijn Pieters <mjpieters@fb.com> parents: 28784 diff changeset	1013 """Produce a warning message for the current active exception"""
28784 09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1014
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1015 # For compatibility checking, we discard the portion of the hg
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1016 # version after the + on the assumption that if a "normal
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1017 # user" is running a build with a + in it the packager
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1018 # probably built from fairly close to a tag and anyone with a
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1019 # 'make local' copy of hg (where the version number can be out
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1020 # of date) will be clueful enough to notice the implausible
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1021 # version number and try updating.
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1022 ct = util.versiontuple(n=2)
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1023 worst = None, ct, ''
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1024 if ui.config('ui', 'supportcontact', None) is None:
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1025 for name, mod in extensions.extensions():
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1026 testedwith = getattr(mod, 'testedwith', '')
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1027 report = getattr(mod, 'buglink', _('the extension author.'))
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1028 if not testedwith.strip():
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1029 # We found an untested extension. It's likely the culprit.
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1030 worst = name, 'unknown', report
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1031 break
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1032
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1033 # Never blame on extensions bundled with Mercurial.
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1034 if testedwith == 'internal':
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1035 continue
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1036
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1037 tested = [util.versiontuple(t, 2) for t in testedwith.split()]
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1038 if ct in tested:
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1039 continue
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1040
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1041 lower = [t for t in tested if t < ct]
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1042 nearest = max(lower or tested)
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1043 if worst[0] is None or nearest < worst[1]:
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1044 worst = name, nearest, report
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1045 if worst[0] is not None:
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1046 name, testedwith, report = worst
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1047 if not isinstance(testedwith, str):
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1048 testedwith = '.'.join([str(c) for c in testedwith])
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1049 warning = (_('** Unknown exception encountered with '
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1050 'possibly-broken third-party extension %s\n'
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1051 '** which supports versions %s of Mercurial.\n'
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1052 '** Please disable %s and try your action again.\n'
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1053 '** If that fixes the bug please report it to %s\n')
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1054 % (name, testedwith, name, report))
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1055 else:
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1056 bugtracker = ui.config('ui', 'supportcontact', None)
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1057 if bugtracker is None:
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1058 bugtracker = _("https://mercurial-scm.org/wiki/BugTracker")
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1059 warning = (_("** unknown exception encountered, "
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1060 "please report by visiting\n** ") + bugtracker + '\n')
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1061 warning += ((_("** Python %s\n") % sys.version.replace('\n', '')) +
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1062 (_("** Mercurial Distributed SCM (version %s)\n") %
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1063 util.version()) +
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1064 (_("** Extensions loaded: %s\n") %
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1065 ", ".join([x[0] for x in extensions.extensions()])))
28821 d3369dc6c1d0 dispatch: split out warning message generation to separate function Martijn Pieters <mjpieters@fb.com> parents: 28784 diff changeset	1066 return warning
d3369dc6c1d0 dispatch: split out warning message generation to separate function Martijn Pieters <mjpieters@fb.com> parents: 28784 diff changeset	1067
d3369dc6c1d0 dispatch: split out warning message generation to separate function Martijn Pieters <mjpieters@fb.com> parents: 28784 diff changeset	1068 def handlecommandexception(ui):
d3369dc6c1d0 dispatch: split out warning message generation to separate function Martijn Pieters <mjpieters@fb.com> parents: 28784 diff changeset	1069 """Produce a warning message for broken commands
d3369dc6c1d0 dispatch: split out warning message generation to separate function Martijn Pieters <mjpieters@fb.com> parents: 28784 diff changeset	1070
d3369dc6c1d0 dispatch: split out warning message generation to separate function Martijn Pieters <mjpieters@fb.com> parents: 28784 diff changeset	1071 Called when handling an exception; the exception is reraised if
d3369dc6c1d0 dispatch: split out warning message generation to separate function Martijn Pieters <mjpieters@fb.com> parents: 28784 diff changeset	1072 this function returns False, ignored otherwise.
d3369dc6c1d0 dispatch: split out warning message generation to separate function Martijn Pieters <mjpieters@fb.com> parents: 28784 diff changeset	1073 """
d3369dc6c1d0 dispatch: split out warning message generation to separate function Martijn Pieters <mjpieters@fb.com> parents: 28784 diff changeset	1074 warning = _exceptionwarning(ui)
28784 09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1075 ui.log("commandexception", "%s\n%s\n", warning, traceback.format_exc())
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1076 ui.warn(warning)
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1077 return False # re-raise the exception

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/dispatch.py @ 29132:12769703d4ba