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

annotate mercurial/dispatch.py @ 40402:106adc261492

logtoprocess: sends the canonical command name to the subprocess One of the use-case of logtoprocess is to monitor command duration. With the current code, we only get whatever command name the user typed (either abbreviated or aliased). This makes analytics on the collected data more difficult. Stores the canonical command name in the request object. Pass the stored canonical name in the `req.ui.log("commandfinish", ...)` call as keyword argument to not break potential string formatting. Pass the value as the environment variable named `LTP_COMMAND` to the called script. Differential Revision: https://phab.mercurial-scm.org/D4820

author	Boris Feld <boris.feld@octobus.net>
date	Mon, 22 Oct 2018 15:51:01 +0200
parents	24e493ec2229
children	444861dc1e55

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
24221 4e240d6ab898 dispatch: offer near-edit-distance suggestions for {file,rev}set functions Augie Fackler <augie@google.com> parents: 24163 diff changeset	10 import difflib
25932 d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	11 import errno
30581 541949a10a68 fancyopts: switch from fancyopts.getopt.* to getopt.* Pulkit Goyal <7895pulkit@gmail.com> parents: 30564 diff changeset	12 import getopt
25932 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 signal
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	17 import sys
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	18 import time
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	19 import traceback
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	20
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	21
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	22 from .i18n import _
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	23
39283 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	24 from hgdemandimport import tracing
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	25
25932 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,
30657 b2be4ccaff1d color: load 'colortable' from extension using an 'extraloader' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30591 diff changeset	28 color,
25932 d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	29 commands,
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	30 demandimport,
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	31 encoding,
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	32 error,
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	33 extensions,
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	34 fancyopts,
31080 ab20491b1760 dispatch: rearrange 'unknown command' code to better employ pager Augie Fackler <augie@google.com> parents: 31047 diff changeset	35 help,
25932 d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	36 hg,
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	37 hook,
29792 2654a0aac80d profiling: move profiling code from dispatch.py (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 29773 diff changeset	38 profiling,
30477 7f2b18c34c02 py3: use pycompat.sysargv in dispatch.run() Pulkit Goyal <7895pulkit@gmail.com> parents: 30411 diff changeset	39 pycompat,
30529 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30528 diff changeset	40 scmutil,
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
37087 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36752 diff changeset	45 from .utils import (
37122 d4a2e0d5d042 procutil: bulk-replace util.std* to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37087 diff changeset	46 procutil,
37087 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36752 diff changeset	47 stringutil,
f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36752 diff changeset	48 )
f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36752 diff changeset	49
14438 08bfec2ef031 dispatch: wrap dispatch related information in a request class Idan Kamara <idankk86@gmail.com> parents: 14286 diff changeset	50 class request(object):
16683 525fdb738975 cleanup: eradicate long lines Brodie Rao <brodie@sf.io> parents: 16609 diff changeset	51 def __init__(self, args, ui=None, repo=None, fin=None, fout=None,
32418 71e735bd8170 dispatch: make request accept additional reposetups Jun Wu <quark@fb.com> parents: 32416 diff changeset	52 ferr=None, prereposetups=None):
14438 08bfec2ef031 dispatch: wrap dispatch related information in a request class Idan Kamara <idankk86@gmail.com> parents: 14286 diff changeset	53 self.args = args
14439 80c599eee3f3 dispatch: use the request to store the ui object Idan Kamara <idankk86@gmail.com> parents: 14438 diff changeset	54 self.ui = ui
14510 eccbb9980ada dispatch: add repo to the request Idan Kamara <idankk86@gmail.com> parents: 14439 diff changeset	55 self.repo = repo
14438 08bfec2ef031 dispatch: wrap dispatch related information in a request class Idan Kamara <idankk86@gmail.com> parents: 14286 diff changeset	56
14613 ea8938d3a5aa dispatch: add I/O descriptors to the request Idan Kamara <idankk86@gmail.com> parents: 14601 diff changeset	57 # input/output/error streams
ea8938d3a5aa dispatch: add I/O descriptors to the request Idan Kamara <idankk86@gmail.com> parents: 14601 diff changeset	58 self.fin = fin
ea8938d3a5aa dispatch: add I/O descriptors to the request Idan Kamara <idankk86@gmail.com> parents: 14601 diff changeset	59 self.fout = fout
ea8938d3a5aa dispatch: add I/O descriptors to the request Idan Kamara <idankk86@gmail.com> parents: 14601 diff changeset	60 self.ferr = ferr
ea8938d3a5aa dispatch: add I/O descriptors to the request Idan Kamara <idankk86@gmail.com> parents: 14601 diff changeset	61
35233 6e6d0a5b88e6 dispatch: replace _earlyreq() with new fancyopts-based parser Yuya Nishihara <yuya@tcha.org>* parents: 35232 diff changeset	62 # remember options pre-parsed by _earlyparseopts()
34982 d9aba3730d30 dispatch: abort if early boolean options can't be parsed Yuya Nishihara <yuya@tcha.org> parents: 34981 diff changeset	63 self.earlyoptions = {}
d9aba3730d30 dispatch: abort if early boolean options can't be parsed Yuya Nishihara <yuya@tcha.org> parents: 34981 diff changeset	64
32418 71e735bd8170 dispatch: make request accept additional reposetups Jun Wu <quark@fb.com> parents: 32416 diff changeset	65 # reposetups which run before extensions, useful for chg to pre-fill
71e735bd8170 dispatch: make request accept additional reposetups Jun Wu <quark@fb.com> parents: 32416 diff changeset	66 # low-level repo state (for example, changelog) before extensions.
71e735bd8170 dispatch: make request accept additional reposetups Jun Wu <quark@fb.com> parents: 32416 diff changeset	67 self.prereposetups = prereposetups or []
71e735bd8170 dispatch: make request accept additional reposetups Jun Wu <quark@fb.com> parents: 32416 diff changeset	68
40402 106adc261492 logtoprocess: sends the canonical command name to the subprocess Boris Feld <boris.feld@octobus.net> parents: 39823 diff changeset	69 # store the parsed and canonical command
106adc261492 logtoprocess: sends the canonical command name to the subprocess Boris Feld <boris.feld@octobus.net> parents: 39823 diff changeset	70 self.canonical_command = None
106adc261492 logtoprocess: sends the canonical command name to the subprocess Boris Feld <boris.feld@octobus.net> parents: 39823 diff changeset	71
31956 c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31634 diff changeset	72 def _runexithandlers(self):
c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31634 diff changeset	73 exc = None
c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31634 diff changeset	74 handlers = self.ui._exithandlers
c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31634 diff changeset	75 try:
c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31634 diff changeset	76 while handlers:
c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31634 diff changeset	77 func, args, kwargs = handlers.pop()
c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31634 diff changeset	78 try:
c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31634 diff changeset	79 func(args, *kwargs)
c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31634 diff changeset	80 except: # re-raises below
c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31634 diff changeset	81 if exc is None:
c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31634 diff changeset	82 exc = sys.exc_info()[1]
c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31634 diff changeset	83 self.ui.warn(('error in exit handlers:\n'))
c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31634 diff changeset	84 self.ui.traceback(force=True)
c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31634 diff changeset	85 finally:
c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31634 diff changeset	86 if exc is not None:
c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31634 diff changeset	87 raise exc
c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31634 diff changeset	88
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	89 def run():
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	90 "run the command in sys.argv"
37988 dc1ed7fe33e4 sshserver: do setbinary() by caller (API) Yuya Nishihara <yuya@tcha.org> parents: 37717 diff changeset	91 initstdio()
39283 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	92 with tracing.log('parse args into request'):
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	93 req = request(pycompat.sysargv[1:])
31960 71dcd4a4fa2f stdio: catch StdioError in dispatch.run and clean up appropriately Bryan O'Sullivan <bryano@fb.com> parents: 31958 diff changeset	94 err = None
71dcd4a4fa2f stdio: catch StdioError in dispatch.run and clean up appropriately Bryan O'Sullivan <bryano@fb.com> parents: 31958 diff changeset	95 try:
38038 6f9ac3cb0987 dispatch: unify handling of None returned by a command function Yuya Nishihara <yuya@tcha.org> parents: 38037 diff changeset	96 status = dispatch(req)
34532 b09b3eaf9c96 py3: work around the scope of exception variable in dispatch.run() Yuya Nishihara <yuya@tcha.org> parents: 34486 diff changeset	97 except error.StdioError as e:
b09b3eaf9c96 py3: work around the scope of exception variable in dispatch.run() Yuya Nishihara <yuya@tcha.org> parents: 34486 diff changeset	98 err = e
31960 71dcd4a4fa2f stdio: catch StdioError in dispatch.run and clean up appropriately Bryan O'Sullivan <bryano@fb.com> parents: 31958 diff changeset	99 status = -1
38037 e9c588802529 dispatch: minor code refactor Gregory Szorc <gregory.szorc@gmail.com> parents: 37988 diff changeset	100
e9c588802529 dispatch: minor code refactor Gregory Szorc <gregory.szorc@gmail.com> parents: 37988 diff changeset	101 # In all cases we try to flush stdio streams.
31960 71dcd4a4fa2f stdio: catch StdioError in dispatch.run and clean up appropriately Bryan O'Sullivan <bryano@fb.com> parents: 31958 diff changeset	102 if util.safehasattr(req.ui, 'fout'):
71dcd4a4fa2f stdio: catch StdioError in dispatch.run and clean up appropriately Bryan O'Sullivan <bryano@fb.com> parents: 31958 diff changeset	103 try:
32707 12941a782928 dispatch: do not close stdout and stderr, just flush() instead Yuya Nishihara <yuya@tcha.org> parents: 32674 diff changeset	104 req.ui.fout.flush()
34532 b09b3eaf9c96 py3: work around the scope of exception variable in dispatch.run() Yuya Nishihara <yuya@tcha.org> parents: 34486 diff changeset	105 except IOError as e:
b09b3eaf9c96 py3: work around the scope of exception variable in dispatch.run() Yuya Nishihara <yuya@tcha.org> parents: 34486 diff changeset	106 err = e
31960 71dcd4a4fa2f stdio: catch StdioError in dispatch.run and clean up appropriately Bryan O'Sullivan <bryano@fb.com> parents: 31958 diff changeset	107 status = -1
38037 e9c588802529 dispatch: minor code refactor Gregory Szorc <gregory.szorc@gmail.com> parents: 37988 diff changeset	108
31960 71dcd4a4fa2f stdio: catch StdioError in dispatch.run and clean up appropriately Bryan O'Sullivan <bryano@fb.com> parents: 31958 diff changeset	109 if util.safehasattr(req.ui, 'ferr'):
35653 48fe4f56a3b4 dispatch: handle IOError when writing to stderr Gregory Szorc <gregory.szorc@gmail.com> parents: 35470 diff changeset	110 try:
48fe4f56a3b4 dispatch: handle IOError when writing to stderr Gregory Szorc <gregory.szorc@gmail.com> parents: 35470 diff changeset	111 if err is not None and err.errno != errno.EPIPE:
48fe4f56a3b4 dispatch: handle IOError when writing to stderr Gregory Szorc <gregory.szorc@gmail.com> parents: 35470 diff changeset	112 req.ui.ferr.write('abort: %s\n' %
48fe4f56a3b4 dispatch: handle IOError when writing to stderr Gregory Szorc <gregory.szorc@gmail.com> parents: 35470 diff changeset	113 encoding.strtolocal(err.strerror))
48fe4f56a3b4 dispatch: handle IOError when writing to stderr Gregory Szorc <gregory.szorc@gmail.com> parents: 35470 diff changeset	114 req.ui.ferr.flush()
48fe4f56a3b4 dispatch: handle IOError when writing to stderr Gregory Szorc <gregory.szorc@gmail.com> parents: 35470 diff changeset	115 # There's not much we can do about an I/O error here. So (possibly)
48fe4f56a3b4 dispatch: handle IOError when writing to stderr Gregory Szorc <gregory.szorc@gmail.com> parents: 35470 diff changeset	116 # change the status code and move on.
48fe4f56a3b4 dispatch: handle IOError when writing to stderr Gregory Szorc <gregory.szorc@gmail.com> parents: 35470 diff changeset	117 except IOError:
48fe4f56a3b4 dispatch: handle IOError when writing to stderr Gregory Szorc <gregory.szorc@gmail.com> parents: 35470 diff changeset	118 status = -1
36666 e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36665 diff changeset	119
e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36665 diff changeset	120 _silencestdio()
31960 71dcd4a4fa2f stdio: catch StdioError in dispatch.run and clean up appropriately Bryan O'Sullivan <bryano@fb.com> parents: 31958 diff changeset	121 sys.exit(status & 255)
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	122
36665 c263c684da91 py3: conditionalize initialization of stdio flags Yuya Nishihara <yuya@tcha.org> parents: 36533 diff changeset	123 if pycompat.ispy3:
37988 dc1ed7fe33e4 sshserver: do setbinary() by caller (API) Yuya Nishihara <yuya@tcha.org> parents: 37717 diff changeset	124 def initstdio():
36665 c263c684da91 py3: conditionalize initialization of stdio flags Yuya Nishihara <yuya@tcha.org> parents: 36533 diff changeset	125 pass
36666 e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36665 diff changeset	126
e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36665 diff changeset	127 def _silencestdio():
e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36665 diff changeset	128 for fp in (sys.stdout, sys.stderr):
e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36665 diff changeset	129 # Check if the file is okay
e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36665 diff changeset	130 try:
e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36665 diff changeset	131 fp.flush()
e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36665 diff changeset	132 continue
e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36665 diff changeset	133 except IOError:
e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36665 diff changeset	134 pass
e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36665 diff changeset	135 # Otherwise mark it as closed to silence "Exception ignored in"
e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36665 diff changeset	136 # message emitted by the interpreter finalizer. Be careful to
37122 d4a2e0d5d042 procutil: bulk-replace util.std* to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37087 diff changeset	137 # not close procutil.stdout, which may be a fdopen-ed file object
d4a2e0d5d042 procutil: bulk-replace util.std* to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37087 diff changeset	138 # and its close() actually closes the underlying file descriptor.
36666 e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36665 diff changeset	139 try:
e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36665 diff changeset	140 fp.close()
e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36665 diff changeset	141 except IOError:
e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36665 diff changeset	142 pass
36665 c263c684da91 py3: conditionalize initialization of stdio flags Yuya Nishihara <yuya@tcha.org> parents: 36533 diff changeset	143 else:
37988 dc1ed7fe33e4 sshserver: do setbinary() by caller (API) Yuya Nishihara <yuya@tcha.org> parents: 37717 diff changeset	144 def initstdio():
36665 c263c684da91 py3: conditionalize initialization of stdio flags Yuya Nishihara <yuya@tcha.org> parents: 36533 diff changeset	145 for fp in (sys.stdin, sys.stdout, sys.stderr):
37123 a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37122 diff changeset	146 procutil.setbinary(fp)
34533 163fa0aea71e dispatch: move initialization of sys.std* files Yuya Nishihara <yuya@tcha.org> parents: 34532 diff changeset	147
36666 e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36665 diff changeset	148 def _silencestdio():
e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36665 diff changeset	149 pass
e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36665 diff changeset	150
24221 4e240d6ab898 dispatch: offer near-edit-distance suggestions for {file,rev}set functions Augie Fackler <augie@google.com> parents: 24163 diff changeset	151 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	152 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	153 # 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	154 # 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	155 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	156
27623 b3376fba4ab9 dispatch: report similar names consistently Bryan O'Sullivan <bos@serpentine.com> parents: 27615 diff changeset	157 def _reportsimilar(write, similar):
b3376fba4ab9 dispatch: report similar names consistently Bryan O'Sullivan <bos@serpentine.com> parents: 27615 diff changeset	158 if len(similar) == 1:
b3376fba4ab9 dispatch: report similar names consistently Bryan O'Sullivan <bos@serpentine.com> parents: 27615 diff changeset	159 write(_("(did you mean %s?)\n") % similar[0])
b3376fba4ab9 dispatch: report similar names consistently Bryan O'Sullivan <bos@serpentine.com> parents: 27615 diff changeset	160 elif similar:
b3376fba4ab9 dispatch: report similar names consistently Bryan O'Sullivan <bos@serpentine.com> parents: 27615 diff changeset	161 ss = ", ".join(sorted(similar))
b3376fba4ab9 dispatch: report similar names consistently Bryan O'Sullivan <bos@serpentine.com> parents: 27615 diff changeset	162 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	163
24039 2ee35b6ee4fb dispatch: consolidate formatting of ParseErrors Augie Fackler <augie@google.com> parents: 23871 diff changeset	164 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	165 similar = []
4e240d6ab898 dispatch: offer near-edit-distance suggestions for {file,rev}set functions Augie Fackler <augie@google.com> parents: 24163 diff changeset	166 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	167 # 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	168 similar = _getsimilar(inst.symbols, inst.function)
24039 2ee35b6ee4fb dispatch: consolidate formatting of ParseErrors Augie Fackler <augie@google.com> parents: 23871 diff changeset	169 if len(inst.args) > 1:
2ee35b6ee4fb dispatch: consolidate formatting of ParseErrors Augie Fackler <augie@google.com> parents: 23871 diff changeset	170 write(_("hg: parse error at %s: %s\n") %
36533 8b662717c53f py3: use bytestr() to coerce position carried by ParseError to string Yuya Nishihara <yuya@tcha.org> parents: 36162 diff changeset	171 (pycompat.bytestr(inst.args[1]), inst.args[0]))
36752 389b950f5190 py3: use startswith() instead of slicing to detect leading whitespace Yuya Nishihara <yuya@tcha.org> parents: 36743 diff changeset	172 if inst.args[0].startswith(' '):
24039 2ee35b6ee4fb dispatch: consolidate formatting of ParseErrors Augie Fackler <augie@google.com> parents: 23871 diff changeset	173 write(_("unexpected leading whitespace\n"))
2ee35b6ee4fb dispatch: consolidate formatting of ParseErrors Augie Fackler <augie@google.com> parents: 23871 diff changeset	174 else:
2ee35b6ee4fb dispatch: consolidate formatting of ParseErrors Augie Fackler <augie@google.com> parents: 23871 diff changeset	175 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	176 _reportsimilar(write, similar)
28515 491eabd0df79 dispatch: extract common logic for handling ParseError Jun Wu <quark@fb.com> parents: 28447 diff changeset	177 if inst.hint:
491eabd0df79 dispatch: extract common logic for handling ParseError Jun Wu <quark@fb.com> parents: 28447 diff changeset	178 write(_("(%s)\n") % inst.hint)
24039 2ee35b6ee4fb dispatch: consolidate formatting of ParseErrors Augie Fackler <augie@google.com> parents: 23871 diff changeset	179
31499 3c77414a0f9c dispatch: consolidate formatting of arguments Augie Fackler <augie@google.com> parents: 31498 diff changeset	180 def _formatargs(args):
37123 a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37122 diff changeset	181 return ' '.join(procutil.shellquote(a) for a in args)
31499 3c77414a0f9c dispatch: consolidate formatting of arguments Augie Fackler <augie@google.com> parents: 31498 diff changeset	182
14438 08bfec2ef031 dispatch: wrap dispatch related information in a request class Idan Kamara <idankk86@gmail.com> parents: 14286 diff changeset	183 def dispatch(req):
38038 6f9ac3cb0987 dispatch: unify handling of None returned by a command function Yuya Nishihara <yuya@tcha.org> parents: 38037 diff changeset	184 """run the command specified in req.args; returns an integer status code"""
39283 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	185 with tracing.log('dispatch.dispatch'):
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	186 if req.ferr:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	187 ferr = req.ferr
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	188 elif req.ui:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	189 ferr = req.ui.ferr
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	190 else:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	191 ferr = procutil.stderr
14615 9fba795dd030 dispatch: assign I/O descriptors from the request to the ui Idan Kamara <idankk86@gmail.com> parents: 14613 diff changeset	192
39283 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	193 try:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	194 if not req.ui:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	195 req.ui = uimod.ui.load()
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	196 req.earlyoptions.update(_earlyparseopts(req.ui, req.args))
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	197 if req.earlyoptions['traceback']:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	198 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	199
39283 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	200 # set ui streams from the request
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	201 if req.fin:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	202 req.ui.fin = req.fin
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	203 if req.fout:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	204 req.ui.fout = req.fout
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	205 if req.ferr:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	206 req.ui.ferr = req.ferr
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	207 except error.Abort as inst:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	208 ferr.write(_("abort: %s\n") % inst)
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	209 if inst.hint:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	210 ferr.write(_("(%s)\n") % inst.hint)
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	211 return -1
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	212 except error.ParseError as inst:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	213 _formatparse(ferr.write, inst)
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	214 return -1
14615 9fba795dd030 dispatch: assign I/O descriptors from the request to the ui Idan Kamara <idankk86@gmail.com> parents: 14613 diff changeset	215
39283 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	216 msg = _formatargs(req.args)
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	217 starttime = util.timer()
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	218 ret = 1 # default of Python exit code on unhandled exception
28520 84cc72c5771e dispatch: catch KeyboardInterrupt more broadly Yuya Nishihara <yuya@tcha.org> parents: 28515 diff changeset	219 try:
39283 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	220 ret = _runcatch(req) or 0
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	221 except error.ProgrammingError as inst:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	222 req.ui.error(_('** ProgrammingError: %s\n') % inst)
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	223 if inst.hint:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	224 req.ui.error(_('** (%s)\n') % inst.hint)
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	225 raise
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	226 except KeyboardInterrupt as inst:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	227 try:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	228 if isinstance(inst, error.SignalInterrupt):
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	229 msg = _("killed!\n")
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	230 else:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	231 msg = _("interrupted!\n")
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	232 req.ui.error(msg)
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	233 except error.SignalInterrupt:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	234 # maybe pager would quit without consuming all the output, and
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	235 # SIGPIPE was raised. we cannot print anything in this case.
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	236 pass
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	237 except IOError as inst:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	238 if inst.errno != errno.EPIPE:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	239 raise
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	240 ret = -1
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	241 finally:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	242 duration = util.timer() - starttime
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	243 req.ui.flush()
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	244 if req.ui.logblockedtimes:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	245 req.ui._blockedtimes['command_duration'] = duration * 1000
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	246 req.ui.log('uiblocked', 'ui blocked ms',
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	247 **pycompat.strkwargs(req.ui._blockedtimes))
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	248 req.ui.log("commandfinish", "%s exited %d after %0.2f seconds\n",
40402 106adc261492 logtoprocess: sends the canonical command name to the subprocess Boris Feld <boris.feld@octobus.net> parents: 39823 diff changeset	249 msg, ret & 255, duration,
106adc261492 logtoprocess: sends the canonical command name to the subprocess Boris Feld <boris.feld@octobus.net> parents: 39823 diff changeset	250 canonical_command=req.canonical_command)
39283 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	251 try:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	252 req._runexithandlers()
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	253 except: # exiting, so no re-raises
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	254 ret = ret or -1
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	255 return ret
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	256
14439 80c599eee3f3 dispatch: use the request to store the ui object Idan Kamara <idankk86@gmail.com> parents: 14438 diff changeset	257 def _runcatch(req):
39283 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	258 with tracing.log('dispatch._runcatch'):
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	259 def catchterm(*args):
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	260 raise error.SignalInterrupt
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	261
39283 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	262 ui = req.ui
32050 77eaf9539499 dispatch: protect against malicious 'hg serve --stdio' invocations (sec) Augie Fackler <augie@google.com> parents: 30681 diff changeset	263 try:
39283 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	264 for name in 'SIGBREAK', 'SIGHUP', 'SIGTERM':
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	265 num = getattr(signal, name, None)
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	266 if num:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	267 signal.signal(num, catchterm)
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	268 except ValueError:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	269 pass # happens if called in a thread
32050 77eaf9539499 dispatch: protect against malicious 'hg serve --stdio' invocations (sec) Augie Fackler <augie@google.com> parents: 30681 diff changeset	270
39283 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	271 def _runcatchfunc():
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	272 realcmd = None
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	273 try:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	274 cmdargs = fancyopts.fancyopts(
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	275 req.args[:], commands.globalopts, {})
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	276 cmd = cmdargs[0]
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	277 aliases, entry = cmdutil.findcmd(cmd, commands.table, False)
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	278 realcmd = aliases[0]
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	279 except (error.UnknownCommand, error.AmbiguousCommand,
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	280 IndexError, getopt.GetoptError):
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	281 # Don't handle this here. We know the command is
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	282 # invalid, but all we're worried about for now is that
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	283 # it's not a command that server operators expect to
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	284 # be safe to offer to users in a sandbox.
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	285 pass
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	286 if realcmd == 'serve' and '--stdio' in cmdargs:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	287 # We want to constrain 'hg serve --stdio' instances pretty
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	288 # closely, as many shared-ssh access tools want to grant
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	289 # access to run only 'hg -R $repo serve --stdio'. We
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	290 # restrict to exactly that set of arguments, and prohibit
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	291 # any repo name that starts with '--' to prevent
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	292 # shenanigans wherein a user does something like pass
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	293 # --debugger or --config=ui.debugger=1 as a repo
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	294 # name. This used to actually run the debugger.
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	295 if (len(req.args) != 4 or
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	296 req.args[0] != '-R' or
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	297 req.args[1].startswith('--') or
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	298 req.args[2] != 'serve' or
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	299 req.args[3] != '--stdio'):
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	300 raise error.Abort(
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	301 _('potentially unsafe serve --stdio invocation: %s') %
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	302 (stringutil.pprint(req.args),))
19639 09573ad59f7b dispatch: move command line --config argument parsing to _runcatch() Sean Farley <sean.michael.farley@gmail.com> parents: 19229 diff changeset	303
39283 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	304 try:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	305 debugger = 'pdb'
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	306 debugtrace = {
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	307 'pdb': pdb.set_trace
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	308 }
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	309 debugmortem = {
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	310 'pdb': pdb.post_mortem
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	311 }
19639 09573ad59f7b dispatch: move command line --config argument parsing to _runcatch() Sean Farley <sean.michael.farley@gmail.com> parents: 19229 diff changeset	312
39283 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	313 # read --config before doing anything else
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	314 # (e.g. to change trust settings for reading .hg/hgrc)
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	315 cfgs = _parseconfig(req.ui, req.earlyoptions['config'])
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	316
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	317 if req.repo:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	318 # copy configs that were passed on the cmdline (--config) to
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	319 # the repo ui
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	320 for sec, name, val in cfgs:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	321 req.repo.ui.setconfig(sec, name, val, source='--config')
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	322
39283 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	323 # developer config: ui.debugger
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	324 debugger = ui.config("ui", "debugger")
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	325 debugmod = pdb
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	326 if not debugger or ui.plain():
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	327 # if we are in HGPLAIN mode, then disable custom debugging
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	328 debugger = 'pdb'
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	329 elif req.earlyoptions['debugger']:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	330 # This import can be slow for fancy debuggers, so only
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	331 # do it when absolutely necessary, i.e. when actual
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	332 # debugging has been requested
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	333 with demandimport.deactivated():
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	334 try:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	335 debugmod = __import__(debugger)
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	336 except ImportError:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	337 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	338
39283 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	339 debugtrace[debugger] = debugmod.set_trace
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	340 debugmortem[debugger] = debugmod.post_mortem
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	341
39283 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	342 # enter the debugger before command execution
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	343 if req.earlyoptions['debugger']:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	344 ui.warn(_("entering debugger - "
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	345 "type c to continue starting hg or h for help\n"))
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	346
39283 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	347 if (debugger != 'pdb' and
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	348 debugtrace[debugger] == debugtrace['pdb']):
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	349 ui.warn(_("%s debugger specified "
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	350 "but its module was not found\n") % debugger)
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	351 with demandimport.deactivated():
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	352 debugtrace[debugger]()
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	353 try:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	354 return _dispatch(req)
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	355 finally:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	356 ui.flush()
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	357 except: # re-raises
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	358 # enter the debugger when we hit an exception
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	359 if req.earlyoptions['debugger']:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	360 traceback.print_exc()
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	361 debugmortem[debugger](sys.exc_info()[2])
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	362 raise
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	363 return _callcatch(ui, _runcatchfunc)
29773 39149b6036e6 dispatch: split global error handling out so it can be reused Jun Wu <quark@fb.com> parents: 29132 diff changeset	364
32040 0fb78cb90ca7 dispatch: mark callcatch() as a private function Yuya Nishihara <yuya@tcha.org> parents: 31960 diff changeset	365 def _callcatch(ui, func):
30529 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30528 diff changeset	366 """like scmutil.callcatch but handles more high-level exceptions about
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30528 diff changeset	367 config parsing and commands. besides, use handlecommandexception to handle
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30528 diff changeset	368 uncaught exceptions.
29773 39149b6036e6 dispatch: split global error handling out so it can be reused Jun Wu <quark@fb.com> parents: 29132 diff changeset	369 """
39149b6036e6 dispatch: split global error handling out so it can be reused Jun Wu <quark@fb.com> parents: 29132 diff changeset	370 try:
30529 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30528 diff changeset	371 return scmutil.callcatch(ui, func)
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25329 diff changeset	372 except error.AmbiguousCommand as inst:
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	373 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	374 (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	375 except error.CommandError as inst:
7645 020a896a5292 dispatch: sort exception handlers Matt Mackall <mpm@selenic.com> parents: 7644 diff changeset	376 if inst.args[0]:
31276 8089de5fab89 dispatch: add pagination of two more help cases Augie Fackler <augie@google.com> parents: 31209 diff changeset	377 ui.pager('help')
32643 3ce53a499334 dispatch: convert exception payload to bytes more carefully Augie Fackler <raf@durin42.com> parents: 32599 diff changeset	378 msgbytes = pycompat.bytestr(inst.args[1])
3ce53a499334 dispatch: convert exception payload to bytes more carefully Augie Fackler <raf@durin42.com> parents: 32599 diff changeset	379 ui.warn(_("hg %s: %s\n") % (inst.args[0], msgbytes))
14286 005a540e9aee help: add -c/--command flag to only show command help (issue2799) Martin Geisler <mg@aragost.com> parents: 14265 diff changeset	380 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	381 else:
020a896a5292 dispatch: sort exception handlers Matt Mackall <mpm@selenic.com> parents: 7644 diff changeset	382 ui.warn(_("hg: %s\n") % inst.args[1])
38828 a9ff2b0c11dd dispatch: show a short error message when invalid global option given Martin von Zweigbergk <martinvonz@google.com> parents: 38827 diff changeset	383 ui.warn(_("(use 'hg help -v' for a list of global options)\n"))
30529 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30528 diff changeset	384 except error.ParseError as inst:
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30528 diff changeset	385 _formatparse(ui.warn, inst)
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30528 diff changeset	386 return -1
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25329 diff changeset	387 except error.UnknownCommand as inst:
31080 ab20491b1760 dispatch: rearrange 'unknown command' code to better employ pager Augie Fackler <augie@google.com> parents: 31047 diff changeset	388 nocmdmsg = _("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	389 try:
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10282 diff changeset	390 # 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	391 # (but don't check for extensions themselves)
32599 1b90036f42f0 help: pass commands module by argument Yuya Nishihara <yuya@tcha.org> parents: 32418 diff changeset	392 formatted = help.formattedhelp(ui, commands, inst.args[0],
1b90036f42f0 help: pass commands module by argument Yuya Nishihara <yuya@tcha.org> parents: 32418 diff changeset	393 unknowncmd=True)
31080 ab20491b1760 dispatch: rearrange 'unknown command' code to better employ pager Augie Fackler <augie@google.com> parents: 31047 diff changeset	394 ui.warn(nocmdmsg)
ab20491b1760 dispatch: rearrange 'unknown command' code to better employ pager Augie Fackler <augie@google.com> parents: 31047 diff changeset	395 ui.write(formatted)
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26421 diff changeset	396 except (error.UnknownCommand, error.Abort):
24222 02d7b5cd373b dispatch: offer suggestions of similar-named commands Augie Fackler <augie@google.com> parents: 24221 diff changeset	397 suggested = False
02d7b5cd373b dispatch: offer suggestions of similar-named commands Augie Fackler <augie@google.com> parents: 24221 diff changeset	398 if len(inst.args) == 2:
02d7b5cd373b dispatch: offer suggestions of similar-named commands Augie Fackler <augie@google.com> parents: 24221 diff changeset	399 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	400 if sim:
31080 ab20491b1760 dispatch: rearrange 'unknown command' code to better employ pager Augie Fackler <augie@google.com> parents: 31047 diff changeset	401 ui.warn(nocmdmsg)
27623 b3376fba4ab9 dispatch: report similar names consistently Bryan O'Sullivan <bos@serpentine.com> parents: 27615 diff changeset	402 _reportsimilar(ui.warn, sim)
24222 02d7b5cd373b dispatch: offer suggestions of similar-named commands Augie Fackler <augie@google.com> parents: 24221 diff changeset	403 suggested = True
02d7b5cd373b dispatch: offer suggestions of similar-named commands Augie Fackler <augie@google.com> parents: 24221 diff changeset	404 if not suggested:
31080 ab20491b1760 dispatch: rearrange 'unknown command' code to better employ pager Augie Fackler <augie@google.com> parents: 31047 diff changeset	405 ui.warn(nocmdmsg)
38827 5199c5b6fd29 dispatch: don't show list of commands on bogus command Martin von Zweigbergk <martinvonz@google.com> parents: 38809 diff changeset	406 ui.warn(_("(use 'hg help' for a list of commands)\n"))
30529 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30528 diff changeset	407 except IOError:
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30528 diff changeset	408 raise
7645 020a896a5292 dispatch: sort exception handlers Matt Mackall <mpm@selenic.com> parents: 7644 diff changeset	409 except KeyboardInterrupt:
28520 84cc72c5771e dispatch: catch KeyboardInterrupt more broadly Yuya Nishihara <yuya@tcha.org> parents: 28515 diff changeset	410 raise
30529 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30528 diff changeset	411 except: # probably re-raises
28784 09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	412 if not handlecommandexception(ui):
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	413 raise
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	414
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	415 return -1
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	416
14265 e4ab5ae193f2 add positional arguments to non-shell aliases Alexander Solovyov <alexander@solovyov.net> parents: 14096 diff changeset	417 def aliasargs(fn, givenargs):
34104 5361771f9714 wrapfunction: use functools.partial if possible Jun Wu <quark@fb.com> parents: 34040 diff changeset	418 args = []
5361771f9714 wrapfunction: use functools.partial if possible Jun Wu <quark@fb.com> parents: 34040 diff changeset	419 # only care about alias 'args', ignore 'args' set by extensions.wrapfunction
5361771f9714 wrapfunction: use functools.partial if possible Jun Wu <quark@fb.com> parents: 34040 diff changeset	420 if not util.safehasattr(fn, '_origfunc'):
5361771f9714 wrapfunction: use functools.partial if possible Jun Wu <quark@fb.com> parents: 34040 diff changeset	421 args = getattr(fn, 'args', args)
16294 795d591b6ef5 alias: abort on missing positional args (issue3331) Matt Mackall <mpm@selenic.com> parents: 16277 diff changeset	422 if args:
37123 a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37122 diff changeset	423 cmd = ' '.join(map(procutil.shellquote, args))
14265 e4ab5ae193f2 add positional arguments to non-shell aliases Alexander Solovyov <alexander@solovyov.net> parents: 14096 diff changeset	424
e4ab5ae193f2 add positional arguments to non-shell aliases Alexander Solovyov <alexander@solovyov.net> parents: 14096 diff changeset	425 nums = []
e4ab5ae193f2 add positional arguments to non-shell aliases Alexander Solovyov <alexander@solovyov.net> parents: 14096 diff changeset	426 def replacer(m):
e4ab5ae193f2 add positional arguments to non-shell aliases Alexander Solovyov <alexander@solovyov.net> parents: 14096 diff changeset	427 num = int(m.group(1)) - 1
e4ab5ae193f2 add positional arguments to non-shell aliases Alexander Solovyov <alexander@solovyov.net> parents: 14096 diff changeset	428 nums.append(num)
16277 1c2aaf05f7d7 aliases: use empty string for missing position parameters (issue3331) Matt Mackall <mpm@selenic.com> parents: 15781 diff changeset	429 if num < len(givenargs):
1c2aaf05f7d7 aliases: use empty string for missing position parameters (issue3331) Matt Mackall <mpm@selenic.com> parents: 15781 diff changeset	430 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	431 raise error.Abort(_('too few arguments for command alias'))
31498 492c64afc54c py3: make the regular expression bytes to prevent TypeError Pulkit Goyal <7895pulkit@gmail.com> parents: 31314 diff changeset	432 cmd = re.sub(br'\$(\d+\|\$)', replacer, cmd)
14265 e4ab5ae193f2 add positional arguments to non-shell aliases Alexander Solovyov <alexander@solovyov.net> parents: 14096 diff changeset	433 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	434 if i not in nums]
30681 caf7e1c5efe4 py3: have a bytes version of shlex.split() Pulkit Goyal <7895pulkit@gmail.com> parents: 30657 diff changeset	435 args = pycompat.shlexsplit(cmd)
14265 e4ab5ae193f2 add positional arguments to non-shell aliases Alexander Solovyov <alexander@solovyov.net> parents: 14096 diff changeset	436 return args + givenargs
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	437
22158 bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	438 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	439 '''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	440
bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	441 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	442 '''
bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	443 # 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	444 # 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	445 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	446 replacemap['$0'] = name
bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	447 replacemap['$$'] = '$'
bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	448 replacemap['$@'] = ' '.join(args)
bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	449 # 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	450 # 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	451 # 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	452 # tokenize each argument into exactly one word.
37123 a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37122 diff changeset	453 replacemap['"$@"'] = ' '.join(procutil.shellquote(arg) for arg in args)
22158 bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	454 # escape '\$' for regex
35166 25c543944bc0 py3: add b'' to regular expressions which are raw strings Pulkit Goyal <7895pulkit@gmail.com> parents: 34781 diff changeset	455 regex = '\|'.join(replacemap.keys()).replace('$', br'\$')
22158 bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	456 r = re.compile(regex)
bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	457 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	458
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	459 class cmdalias(object):
37137 6890b7e991a4 help: supporting both help and doc for aliases Rodrigo Damazio <rdamazio@google.com> parents: 37123 diff changeset	460 def __init__(self, ui, name, definition, cmdtable, source):
12039 18e1e7520b67 alias: make shadowing behavior more consistent (issue2054) Brodie Rao <brodie@bitheap.org> parents: 11712 diff changeset	461 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	462 self.cmdname = ''
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	463 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	464 self.fn = None
29087 ad1bdea43965 dispatch: defer environment variable resolution in alias commands (BC) Jun Wu <quark@fb.com> parents: 28861 diff changeset	465 self.givenargs = []
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	466 self.opts = []
21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	467 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	468 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	469 self.unknowncmd = False
28828 3640c1702c43 help: report source of aliases timeless <timeless@mozdev.org> parents: 28821 diff changeset	470 self.source = source
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	471
21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	472 try:
12039 18e1e7520b67 alias: make shadowing behavior more consistent (issue2054) Brodie Rao <brodie@bitheap.org> parents: 11712 diff changeset	473 aliases, entry = cmdutil.findcmd(self.name, cmdtable)
18e1e7520b67 alias: make shadowing behavior more consistent (issue2054) Brodie Rao <brodie@bitheap.org> parents: 11712 diff changeset	474 for alias, e in cmdtable.iteritems():
18e1e7520b67 alias: make shadowing behavior more consistent (issue2054) Brodie Rao <brodie@bitheap.org> parents: 11712 diff changeset	475 if e is entry:
18e1e7520b67 alias: make shadowing behavior more consistent (issue2054) Brodie Rao <brodie@bitheap.org> parents: 11712 diff changeset	476 self.cmd = alias
18e1e7520b67 alias: make shadowing behavior more consistent (issue2054) Brodie Rao <brodie@bitheap.org> parents: 11712 diff changeset	477 break
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	478 self.shadows = True
21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	479 except error.UnknownCommand:
21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	480 self.shadows = False
21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	481
21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	482 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	483 self.badalias = _("no definition for alias '%s'") % self.name
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	484 return
21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	485
11524 24965bb270b7 dispatch: add shell aliases Steve Losh <steve@stevelosh.com> parents: 11495 diff changeset	486 if self.definition.startswith('!'):
37137 6890b7e991a4 help: supporting both help and doc for aliases Rodrigo Damazio <rdamazio@google.com> parents: 37123 diff changeset	487 shdef = self.definition[1:]
12536 208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	488 self.shell = True
11524 24965bb270b7 dispatch: add shell aliases Steve Losh <steve@stevelosh.com> parents: 11495 diff changeset	489 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	490 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	491 def _checkvar(m):
13392 777cef34a890 dispatch: support for $ escaping in shell-alias definition Roman Sokolov <sokolov.r.v@gmail.com> parents: 13382 diff changeset	492 if m.groups()[0] == '$':
777cef34a890 dispatch: support for $ escaping in shell-alias definition Roman Sokolov <sokolov.r.v@gmail.com> parents: 13382 diff changeset	493 return m.group()
777cef34a890 dispatch: support for $ escaping in shell-alias definition Roman Sokolov <sokolov.r.v@gmail.com> parents: 13382 diff changeset	494 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	495 return m.group()
f853873fc66d aliases: provide more flexible ways to work with shell alias arguments Steve Losh <steve@stevelosh.com> parents: 11985 diff changeset	496 else:
14708 8083f4d00bd1 i18n: remove translation of debug messages David Soria Parra <dsp@php.net> parents: 14704 diff changeset	497 ui.debug("No argument found for substitution "
35470 7906354cbc68 debug: add newlines at the end of three locations that appear to need it Kyle Lippincott <spectral@google.com> parents: 35363 diff changeset	498 "of %i variable in alias '%s' definition.\n"
13393 d38d500deb08 dispatch: debug message for missing arguments in shell alias Roman Sokolov <sokolov.r.v@gmail.com> parents: 13392 diff changeset	499 % (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	500 return ''
37137 6890b7e991a4 help: supporting both help and doc for aliases Rodrigo Damazio <rdamazio@google.com> parents: 37123 diff changeset	501 cmd = re.sub(br'\$(\d+\|\$)', _checkvar, shdef)
22158 bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	502 cmd = aliasinterpolate(self.name, args, cmd)
31209 3a03264de3eb dispatch: set a blockedtag when running an external alias Simon Farnsworth <simonfar@fb.com> parents: 31190 diff changeset	503 return ui.system(cmd, environ=env,
3a03264de3eb dispatch: set a blockedtag when running an external alias Simon Farnsworth <simonfar@fb.com> parents: 31190 diff changeset	504 blockedtag='alias_%s' % self.name)
11524 24965bb270b7 dispatch: add shell aliases Steve Losh <steve@stevelosh.com> parents: 11495 diff changeset	505 self.fn = fn
37137 6890b7e991a4 help: supporting both help and doc for aliases Rodrigo Damazio <rdamazio@google.com> parents: 37123 diff changeset	506 self._populatehelp(ui, name, shdef, self.fn)
11524 24965bb270b7 dispatch: add shell aliases Steve Losh <steve@stevelosh.com> parents: 11495 diff changeset	507 return
24965bb270b7 dispatch: add shell aliases Steve Losh <steve@stevelosh.com> parents: 11495 diff changeset	508
21569 c5afb07c33d3 alias: handle shlex error in command aliases Yuya Nishihara <yuya@tcha.org> parents: 21556 diff changeset	509 try:
30681 caf7e1c5efe4 py3: have a bytes version of shlex.split() Pulkit Goyal <7895pulkit@gmail.com> parents: 30657 diff changeset	510 args = pycompat.shlexsplit(self.definition)
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25329 diff changeset	511 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	512 self.badalias = (_("error in definition for alias '%s': %s")
37087 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36752 diff changeset	513 % (self.name, stringutil.forcebytestr(inst)))
21569 c5afb07c33d3 alias: handle shlex error in command aliases Yuya Nishihara <yuya@tcha.org> parents: 21556 diff changeset	514 return
35234 7ce0ba3a1c32 dispatch: replace _earlygetopt(strip=True) with new parser Yuya Nishihara <yuya@tcha.org> parents: 35233 diff changeset	515 earlyopts, args = _earlysplitopts(args)
7ce0ba3a1c32 dispatch: replace _earlygetopt(strip=True) with new parser Yuya Nishihara <yuya@tcha.org> parents: 35233 diff changeset	516 if earlyopts:
7ce0ba3a1c32 dispatch: replace _earlygetopt(strip=True) with new parser Yuya Nishihara <yuya@tcha.org> parents: 35233 diff changeset	517 self.badalias = (_("error in definition for alias '%s': %s may "
7ce0ba3a1c32 dispatch: replace _earlygetopt(strip=True) with new parser Yuya Nishihara <yuya@tcha.org> parents: 35233 diff changeset	518 "only be given on the command line")
35982 f81df691efe7 py3: use pycompat.ziplist instead of zip Pulkit Goyal <7895pulkit@gmail.com> parents: 35939 diff changeset	519 % (self.name, '/'.join(pycompat.ziplist(*earlyopts)
f81df691efe7 py3: use pycompat.ziplist instead of zip Pulkit Goyal <7895pulkit@gmail.com> parents: 35939 diff changeset	520 [0])))
35234 7ce0ba3a1c32 dispatch: replace _earlygetopt(strip=True) with new parser Yuya Nishihara <yuya@tcha.org> parents: 35233 diff changeset	521 return
12092 4982fa38e544 alias: print what command is being shadowed in debug message Brodie Rao <brodie@bitheap.org> parents: 12070 diff changeset	522 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	523 self.givenargs = args
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	524
21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	525 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	526 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	527 if len(tableentry) > 2:
37137 6890b7e991a4 help: supporting both help and doc for aliases Rodrigo Damazio <rdamazio@google.com> parents: 37123 diff changeset	528 self.fn, self.opts, cmdhelp = tableentry
9993 8bce1e0d2801 alias: do not crash when aliased command has no usage help text Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9825 diff changeset	529 else:
8bce1e0d2801 alias: do not crash when aliased command has no usage help text Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9825 diff changeset	530 self.fn, self.opts = tableentry
37137 6890b7e991a4 help: supporting both help and doc for aliases Rodrigo Damazio <rdamazio@google.com> parents: 37123 diff changeset	531 cmdhelp = None
9993 8bce1e0d2801 alias: do not crash when aliased command has no usage help text Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9825 diff changeset	532
37137 6890b7e991a4 help: supporting both help and doc for aliases Rodrigo Damazio <rdamazio@google.com> parents: 37123 diff changeset	533 self._populatehelp(ui, name, cmd, self.fn, cmdhelp)
9876 6e8a16dd3e30 alias: improve help text for command aliases Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 9875 diff changeset	534
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	535 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	536 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	537 % (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	538 self.unknowncmd = True
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	539 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	540 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	541 % (self.name, cmd))
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	542
37137 6890b7e991a4 help: supporting both help and doc for aliases Rodrigo Damazio <rdamazio@google.com> parents: 37123 diff changeset	543 def _populatehelp(self, ui, name, cmd, fn, defaulthelp=None):
37142 aa55c5354b8f alias: reject non-ascii characters in user help/doc strings Yuya Nishihara <yuya@tcha.org> parents: 37137 diff changeset	544 # confine strings to be passed to i18n.gettext()
aa55c5354b8f alias: reject non-ascii characters in user help/doc strings Yuya Nishihara <yuya@tcha.org> parents: 37137 diff changeset	545 cfg = {}
aa55c5354b8f alias: reject non-ascii characters in user help/doc strings Yuya Nishihara <yuya@tcha.org> parents: 37137 diff changeset	546 for k in ('doc', 'help'):
aa55c5354b8f alias: reject non-ascii characters in user help/doc strings Yuya Nishihara <yuya@tcha.org> parents: 37137 diff changeset	547 v = ui.config('alias', '%s:%s' % (name, k), None)
aa55c5354b8f alias: reject non-ascii characters in user help/doc strings Yuya Nishihara <yuya@tcha.org> parents: 37137 diff changeset	548 if v is None:
aa55c5354b8f alias: reject non-ascii characters in user help/doc strings Yuya Nishihara <yuya@tcha.org> parents: 37137 diff changeset	549 continue
aa55c5354b8f alias: reject non-ascii characters in user help/doc strings Yuya Nishihara <yuya@tcha.org> parents: 37137 diff changeset	550 if not encoding.isasciistr(v):
aa55c5354b8f alias: reject non-ascii characters in user help/doc strings Yuya Nishihara <yuya@tcha.org> parents: 37137 diff changeset	551 self.badalias = (_("non-ASCII character in alias definition "
aa55c5354b8f alias: reject non-ascii characters in user help/doc strings Yuya Nishihara <yuya@tcha.org> parents: 37137 diff changeset	552 "'%s:%s'") % (name, k))
aa55c5354b8f alias: reject non-ascii characters in user help/doc strings Yuya Nishihara <yuya@tcha.org> parents: 37137 diff changeset	553 return
aa55c5354b8f alias: reject non-ascii characters in user help/doc strings Yuya Nishihara <yuya@tcha.org> parents: 37137 diff changeset	554 cfg[k] = v
aa55c5354b8f alias: reject non-ascii characters in user help/doc strings Yuya Nishihara <yuya@tcha.org> parents: 37137 diff changeset	555
aa55c5354b8f alias: reject non-ascii characters in user help/doc strings Yuya Nishihara <yuya@tcha.org> parents: 37137 diff changeset	556 self.help = cfg.get('help', defaulthelp or '')
37137 6890b7e991a4 help: supporting both help and doc for aliases Rodrigo Damazio <rdamazio@google.com> parents: 37123 diff changeset	557 if self.help and self.help.startswith("hg " + cmd):
6890b7e991a4 help: supporting both help and doc for aliases Rodrigo Damazio <rdamazio@google.com> parents: 37123 diff changeset	558 # drop prefix in old-style help lines so hg shows the alias
6890b7e991a4 help: supporting both help and doc for aliases Rodrigo Damazio <rdamazio@google.com> parents: 37123 diff changeset	559 self.help = self.help[4 + len(cmd):]
6890b7e991a4 help: supporting both help and doc for aliases Rodrigo Damazio <rdamazio@google.com> parents: 37123 diff changeset	560
37143 1d56c539794e py3: bytes/unicode dance on __doc__ of cmdalias Yuya Nishihara <yuya@tcha.org> parents: 37142 diff changeset	561 doc = cfg.get('doc', pycompat.getdoc(fn))
1d56c539794e py3: bytes/unicode dance on __doc__ of cmdalias Yuya Nishihara <yuya@tcha.org> parents: 37142 diff changeset	562 if doc is not None:
1d56c539794e py3: bytes/unicode dance on __doc__ of cmdalias Yuya Nishihara <yuya@tcha.org> parents: 37142 diff changeset	563 doc = pycompat.sysstr(doc)
1d56c539794e py3: bytes/unicode dance on __doc__ of cmdalias Yuya Nishihara <yuya@tcha.org> parents: 37142 diff changeset	564 self.__doc__ = doc
37137 6890b7e991a4 help: supporting both help and doc for aliases Rodrigo Damazio <rdamazio@google.com> parents: 37123 diff changeset	565
29087 ad1bdea43965 dispatch: defer environment variable resolution in alias commands (BC) Jun Wu <quark@fb.com> parents: 28861 diff changeset	566 @property
ad1bdea43965 dispatch: defer environment variable resolution in alias commands (BC) Jun Wu <quark@fb.com> parents: 28861 diff changeset	567 def args(self):
31634 2632df096fc0 dispatch: use pycompat.maplist() instead of map() to get a list Pulkit Goyal <7895pulkit@gmail.com> parents: 31509 diff changeset	568 args = pycompat.maplist(util.expandpath, self.givenargs)
29087 ad1bdea43965 dispatch: defer environment variable resolution in alias commands (BC) Jun Wu <quark@fb.com> parents: 28861 diff changeset	569 return aliasargs(self.fn, args)
ad1bdea43965 dispatch: defer environment variable resolution in alias commands (BC) Jun Wu <quark@fb.com> parents: 28861 diff changeset	570
28621 d856e85a8a7a dispatch: make cmdalias forward command attributes to function Yuya Nishihara <yuya@tcha.org> parents: 28538 diff changeset	571 def __getattr__(self, name):
37716 dfc51a482031 registrar: replace "cmdtype" with an intent-based mechanism (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37143 diff changeset	572 adefaults = {r'norepo': True, r'intents': set(),
32207 89153b0d4881 py3: make adefaults keys str to be compatible with getattr Pulkit Goyal <7895pulkit@gmail.com> parents: 32183 diff changeset	573 r'optionalrepo': False, r'inferrepo': False}
28621 d856e85a8a7a dispatch: make cmdalias forward command attributes to function Yuya Nishihara <yuya@tcha.org> parents: 28538 diff changeset	574 if name not in adefaults:
d856e85a8a7a dispatch: make cmdalias forward command attributes to function Yuya Nishihara <yuya@tcha.org> parents: 28538 diff changeset	575 raise AttributeError(name)
d856e85a8a7a dispatch: make cmdalias forward command attributes to function Yuya Nishihara <yuya@tcha.org> parents: 28538 diff changeset	576 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	577 return adefaults[name]
d856e85a8a7a dispatch: make cmdalias forward command attributes to function Yuya Nishihara <yuya@tcha.org> parents: 28538 diff changeset	578 return getattr(self.fn, name)
d856e85a8a7a dispatch: make cmdalias forward command attributes to function Yuya Nishihara <yuya@tcha.org> parents: 28538 diff changeset	579
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	580 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	581 if self.badalias:
22164 efd65e51bc0b alias: exit from bad definition by Abort Yuya Nishihara <yuya@tcha.org> parents: 22163 diff changeset	582 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	583 if self.unknowncmd:
10364 de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10282 diff changeset	584 try:
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10282 diff changeset	585 # 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	586 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	587 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	588 except error.UnknownCommand:
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10282 diff changeset	589 pass
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26421 diff changeset	590 raise error.Abort(self.badalias, hint=hint)
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	591 if self.shadows:
14704 b24d596fcd25 Backed out changeset 1ec8bd909ac3 Martin Geisler <mg@aragost.com> parents: 14702 diff changeset	592 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	593 (self.name, self.cmdname))
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	594
29857 318e2b600b80 blackbox: also log alias expansions Augie Fackler <augie@google.com> parents: 29852 diff changeset	595 ui.log('commandalias', "alias '%s' expands to '%s'\n",
318e2b600b80 blackbox: also log alias expansions Augie Fackler <augie@google.com> parents: 29852 diff changeset	596 self.name, self.definition)
14950 144e97421f6b dispatch: use safehasattr instead of hasattr Augie Fackler <durin42@gmail.com> parents: 14918 diff changeset	597 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	598 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	599 else:
12093 cd895084a4cd alias: on --debug, print expansion when it has invalid arguments Brodie Rao <brodie@bitheap.org> parents: 12092 diff changeset	600 try:
21556 5e13507a3b4e alias: fix loss of non-zero return code in command aliases Yuya Nishihara <yuya@tcha.org> parents: 20829 diff changeset	601 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	602 except error.SignatureError:
cd895084a4cd alias: on --debug, print expansion when it has invalid arguments Brodie Rao <brodie@bitheap.org> parents: 12092 diff changeset	603 args = ' '.join([self.cmdname] + self.args)
14704 b24d596fcd25 Backed out changeset 1ec8bd909ac3 Martin Geisler <mg@aragost.com> parents: 14702 diff changeset	604 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	605 raise
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	606
34313 bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	607 class lazyaliasentry(object):
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	608 """like a typical command entry (func, opts, help), but is lazy"""
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	609
37137 6890b7e991a4 help: supporting both help and doc for aliases Rodrigo Damazio <rdamazio@google.com> parents: 37123 diff changeset	610 def __init__(self, ui, name, definition, cmdtable, source):
6890b7e991a4 help: supporting both help and doc for aliases Rodrigo Damazio <rdamazio@google.com> parents: 37123 diff changeset	611 self.ui = ui
34313 bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	612 self.name = name
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	613 self.definition = definition
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	614 self.cmdtable = cmdtable.copy()
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	615 self.source = source
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	616
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	617 @util.propertycache
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	618 def _aliasdef(self):
37137 6890b7e991a4 help: supporting both help and doc for aliases Rodrigo Damazio <rdamazio@google.com> parents: 37123 diff changeset	619 return cmdalias(self.ui, self.name, self.definition, self.cmdtable,
6890b7e991a4 help: supporting both help and doc for aliases Rodrigo Damazio <rdamazio@google.com> parents: 37123 diff changeset	620 self.source)
34313 bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	621
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	622 def __getitem__(self, n):
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	623 aliasdef = self._aliasdef
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	624 if n == 0:
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	625 return aliasdef
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	626 elif n == 1:
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	627 return aliasdef.opts
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	628 elif n == 2:
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	629 return aliasdef.help
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	630 else:
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	631 raise IndexError
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	632
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	633 def __iter__(self):
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	634 for i in range(3):
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	635 yield self[i]
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	636
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	637 def __len__(self):
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	638 return 3
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	639
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	640 def addaliases(ui, cmdtable):
21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	641 # aliases are processed after extensions have been loaded, so they
21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	642 # 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	643 # but only if they have been defined prior to the current definition.
37137 6890b7e991a4 help: supporting both help and doc for aliases Rodrigo Damazio <rdamazio@google.com> parents: 37123 diff changeset	644 for alias, definition in ui.configitems('alias', ignoresub=True):
15019 f4b7be3f8430 dispatch: don't rewrap aliases that have the same definition Idan Kamara <idankk86@gmail.com> parents: 14992 diff changeset	645 try:
34313 bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	646 if cmdtable[alias].definition == definition:
15019 f4b7be3f8430 dispatch: don't rewrap aliases that have the same definition Idan Kamara <idankk86@gmail.com> parents: 14992 diff changeset	647 continue
f4b7be3f8430 dispatch: don't rewrap aliases that have the same definition Idan Kamara <idankk86@gmail.com> parents: 14992 diff changeset	648 except (KeyError, AttributeError):
f4b7be3f8430 dispatch: don't rewrap aliases that have the same definition Idan Kamara <idankk86@gmail.com> parents: 14992 diff changeset	649 # 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	650 pass
f4b7be3f8430 dispatch: don't rewrap aliases that have the same definition Idan Kamara <idankk86@gmail.com> parents: 14992 diff changeset	651
34312 0e48813cc106 alias: test duplicated definition earlier Jun Wu <quark@fb.com> parents: 34146 diff changeset	652 source = ui.configsource('alias', alias)
37137 6890b7e991a4 help: supporting both help and doc for aliases Rodrigo Damazio <rdamazio@google.com> parents: 37123 diff changeset	653 entry = lazyaliasentry(ui, alias, definition, cmdtable, source)
34313 bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	654 cmdtable[alias] = entry
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	655
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	656 def _parse(ui, args):
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	657 options = {}
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	658 cmdoptions = {}
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	659
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	660 try:
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	661 args = fancyopts.fancyopts(args, commands.globalopts, options)
30581 541949a10a68 fancyopts: switch from fancyopts.getopt.* to getopt.* Pulkit Goyal <7895pulkit@gmail.com> parents: 30564 diff changeset	662 except getopt.GetoptError as inst:
37087 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36752 diff changeset	663 raise error.CommandError(None, stringutil.forcebytestr(inst))
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	664
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	665 if args:
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	666 cmd, args = args[0], args[1:]
9875 d6a95c5f6ff9 dispatch: minor refactoring Henri Wiechers <hwiechers@gmail.com> parents: 9825 diff changeset	667 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	668 ui.configbool("ui", "strict"))
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	669 cmd = aliases[0]
14265 e4ab5ae193f2 add positional arguments to non-shell aliases Alexander Solovyov <alexander@solovyov.net> parents: 14096 diff changeset	670 args = aliasargs(entry[0], args)
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	671 defaults = ui.config("defaults", cmd)
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	672 if defaults:
31509 9916b3d579a9 dispatch: use pycompat.maplist to allow summing with args Augie Fackler <augie@google.com> parents: 31507 diff changeset	673 args = pycompat.maplist(
9916b3d579a9 dispatch: use pycompat.maplist to allow summing with args Augie Fackler <augie@google.com> parents: 31507 diff changeset	674 util.expandpath, pycompat.shlexsplit(defaults)) + args
9875 d6a95c5f6ff9 dispatch: minor refactoring Henri Wiechers <hwiechers@gmail.com> parents: 9825 diff changeset	675 c = list(entry[1])
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	676 else:
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	677 cmd = None
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	678 c = []
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	679
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	680 # combine global options into local
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	681 for o in commands.globalopts:
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	682 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	683
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	684 try:
29833 61a4cdc98307 dispatch: explicitly pass fancyopts optional arg as a keyword Augie Fackler <augie@google.com> parents: 29795 diff changeset	685 args = fancyopts.fancyopts(args, c, cmdoptions, gnu=True)
30581 541949a10a68 fancyopts: switch from fancyopts.getopt.* to getopt.* Pulkit Goyal <7895pulkit@gmail.com> parents: 30564 diff changeset	686 except getopt.GetoptError as inst:
37087 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36752 diff changeset	687 raise error.CommandError(cmd, stringutil.forcebytestr(inst))
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	688
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	689 # separate global options back out
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	690 for o in commands.globalopts:
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	691 n = o[1]
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	692 options[n] = cmdoptions[n]
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	693 del cmdoptions[n]
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	694
9875 d6a95c5f6ff9 dispatch: minor refactoring Henri Wiechers <hwiechers@gmail.com> parents: 9825 diff changeset	695 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	696
8137 7fd0616b3d80 ui: kill updateopts Matt Mackall <mpm@selenic.com> parents: 8136 diff changeset	697 def _parseconfig(ui, config):
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	698 """parse the --config options from the command line"""
14753 10dcb3e7cb55 dispatch: return read config options Idan Kamara <idankk86@gmail.com> parents: 14752 diff changeset	699 configs = []
10dcb3e7cb55 dispatch: return read config options Idan Kamara <idankk86@gmail.com> parents: 14752 diff changeset	700
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	701 for cfg in config:
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	702 try:
28081 a6344df5108e dispatch: strip command line options like config file options Tony Tung <ttung@fb.com> parents: 27679 diff changeset	703 name, value = [cfgelem.strip()
a6344df5108e dispatch: strip command line options like config file options Tony Tung <ttung@fb.com> parents: 27679 diff changeset	704 for cfgelem in cfg.split('=', 1)]
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	705 section, name = name.split('.', 1)
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	706 if not section or not name:
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	707 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	708 ui.setconfig(section, name, value, '--config')
14753 10dcb3e7cb55 dispatch: return read config options Idan Kamara <idankk86@gmail.com> parents: 14752 diff changeset	709 configs.append((section, name, value))
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	710 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	711 raise error.Abort(_('malformed --config option: %r '
36670 77f98867538f py3: fix some unicode madness in global exception catcher Yuya Nishihara <yuya@tcha.org> parents: 36666 diff changeset	712 '(use --config section.name=value)')
77f98867538f py3: fix some unicode madness in global exception catcher Yuya Nishihara <yuya@tcha.org> parents: 36666 diff changeset	713 % pycompat.bytestr(cfg))
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	714
14753 10dcb3e7cb55 dispatch: return read config options Idan Kamara <idankk86@gmail.com> parents: 14752 diff changeset	715 return configs
10dcb3e7cb55 dispatch: return read config options Idan Kamara <idankk86@gmail.com> parents: 14752 diff changeset	716
35233 6e6d0a5b88e6 dispatch: replace _earlyreq() with new fancyopts-based parser Yuya Nishihara <yuya@tcha.org>* parents: 35232 diff changeset	717 def _earlyparseopts(ui, args):
34996 c9740b69b9b7 dispatch: add HGPLAIN=+strictflags to restrict early parsing of global options Yuya Nishihara <yuya@tcha.org> parents: 34986 diff changeset	718 options = {}
c9740b69b9b7 dispatch: add HGPLAIN=+strictflags to restrict early parsing of global options Yuya Nishihara <yuya@tcha.org> parents: 34986 diff changeset	719 fancyopts.fancyopts(args, commands.globalopts, options,
35233 6e6d0a5b88e6 dispatch: replace _earlyreq() with new fancyopts-based parser Yuya Nishihara <yuya@tcha.org>* parents: 35232 diff changeset	720 gnu=not ui.plain('strictflags'), early=True,
35232 4edd2202f7d7 dispatch: alias --repo to --repository while parsing early options Yuya Nishihara <yuya@tcha.org> parents: 35197 diff changeset	721 optaliases={'repository': ['repo']})
34996 c9740b69b9b7 dispatch: add HGPLAIN=+strictflags to restrict early parsing of global options Yuya Nishihara <yuya@tcha.org> parents: 34986 diff changeset	722 return options
c9740b69b9b7 dispatch: add HGPLAIN=+strictflags to restrict early parsing of global options Yuya Nishihara <yuya@tcha.org> parents: 34986 diff changeset	723
35234 7ce0ba3a1c32 dispatch: replace _earlygetopt(strip=True) with new parser Yuya Nishihara <yuya@tcha.org> parents: 35233 diff changeset	724 def _earlysplitopts(args):
7ce0ba3a1c32 dispatch: replace _earlygetopt(strip=True) with new parser Yuya Nishihara <yuya@tcha.org> parents: 35233 diff changeset	725 """Split args into a list of possible early options and remainder args"""
7ce0ba3a1c32 dispatch: replace _earlygetopt(strip=True) with new parser Yuya Nishihara <yuya@tcha.org> parents: 35233 diff changeset	726 shortoptions = 'R:'
7ce0ba3a1c32 dispatch: replace _earlygetopt(strip=True) with new parser Yuya Nishihara <yuya@tcha.org> parents: 35233 diff changeset	727 # TODO: perhaps 'debugger' should be included
7ce0ba3a1c32 dispatch: replace _earlygetopt(strip=True) with new parser Yuya Nishihara <yuya@tcha.org> parents: 35233 diff changeset	728 longoptions = ['cwd=', 'repository=', 'repo=', 'config=']
7ce0ba3a1c32 dispatch: replace _earlygetopt(strip=True) with new parser Yuya Nishihara <yuya@tcha.org> parents: 35233 diff changeset	729 return fancyopts.earlygetopt(args, shortoptions, longoptions,
7ce0ba3a1c32 dispatch: replace _earlygetopt(strip=True) with new parser Yuya Nishihara <yuya@tcha.org> parents: 35233 diff changeset	730 gnu=True, keepsep=True)
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	731
11330 713ae78bb583 provide pre- and post- hooks with parsed command line arguments. Chad Dombrova <chadrik@gmail.com> parents: 11305 diff changeset	732 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	733 # 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	734 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	735 pats=cmdpats, opts=cmdoptions)
29129 e6dfb0e4eeef dispatch: add fail-* family of hooks Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 29114 diff changeset	736 try:
e6dfb0e4eeef dispatch: add fail-* family of hooks Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 29114 diff changeset	737 ret = _runcommand(ui, options, cmd, d)
e6dfb0e4eeef dispatch: add fail-* family of hooks Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 29114 diff changeset	738 # run post-hook, passing command result
e6dfb0e4eeef dispatch: add fail-* family of hooks Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 29114 diff changeset	739 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	740 result=ret, pats=cmdpats, opts=cmdoptions)
e6dfb0e4eeef dispatch: add fail-* family of hooks Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 29114 diff changeset	741 except Exception:
e6dfb0e4eeef dispatch: add fail-* family of hooks Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 29114 diff changeset	742 # run failure hook and re-raise
e6dfb0e4eeef dispatch: add fail-* family of hooks Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 29114 diff changeset	743 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	744 pats=cmdpats, opts=cmdoptions)
e6dfb0e4eeef dispatch: add fail-* family of hooks Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 29114 diff changeset	745 raise
7819 14b703252f14 dispatch: extract command execution block into method Bill Barry <after.fallout@gmail.com> parents: 7772 diff changeset	746 return ret
14b703252f14 dispatch: extract command execution block into method Bill Barry <after.fallout@gmail.com> parents: 7772 diff changeset	747
28263 59509c6724c7 dispatch: add wd parameter to _getlocal Jun Wu <quark@fb.com> parents: 28081 diff changeset	748 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	749 """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	750
12536 208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	751 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	752 """
28263 59509c6724c7 dispatch: add wd parameter to _getlocal Jun Wu <quark@fb.com> parents: 28081 diff changeset	753 if wd is None:
59509c6724c7 dispatch: add wd parameter to _getlocal Jun Wu <quark@fb.com> parents: 28081 diff changeset	754 try:
39823 24e493ec2229 py3: rename pycompat.getcwd() to encoding.getcwd() (API) Matt Harbison <matt_harbison@yahoo.com> parents: 39529 diff changeset	755 wd = encoding.getcwd()
28263 59509c6724c7 dispatch: add wd parameter to _getlocal Jun Wu <quark@fb.com> parents: 28081 diff changeset	756 except OSError as e:
59509c6724c7 dispatch: add wd parameter to _getlocal Jun Wu <quark@fb.com> parents: 28081 diff changeset	757 raise error.Abort(_("error getting current working directory: %s") %
34040 d5b2beca16c0 python3: wrap all uses of <exception>.strerror with strtolocal Augie Fackler <raf@durin42.com> parents: 33618 diff changeset	758 encoding.strtolocal(e.strerror))
11675 f92f8921a5cc dispatch: give better error message when cwd doesn't exist (issue2293) Mads Kiilerich <mads@kiilerich.com> parents: 11600 diff changeset	759 path = cmdutil.findrepo(wd) or ""
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	760 if not path:
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	761 lui = ui
9436 96379c93ba6f improve code readability Andrey Somov <py4fun@gmail.com> parents: 9411 diff changeset	762 else:
12636 c24215aa7e69 dispatch: remove superfluous try/except when reading local ui config Brodie Rao <brodie@bitheap.org> parents: 12633 diff changeset	763 lui = ui.copy()
12637 42ca7aef28d3 dispatch: properly handle relative path aliases used with -R (issue2376) Brodie Rao <brodie@bitheap.org> parents: 12636 diff changeset	764 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	765
34985 d3d35a55e03b dispatch: convert non-list option parsed by _earlygetopt() to string Yuya Nishihara <yuya@tcha.org> parents: 34984 diff changeset	766 if rpath:
d3d35a55e03b dispatch: convert non-list option parsed by _earlygetopt() to string Yuya Nishihara <yuya@tcha.org> parents: 34984 diff changeset	767 path = lui.expandpath(rpath)
8190 9b8ac5fb7760 ui: kill most users of parentui name and arg, replace with .copy() Matt Mackall <mpm@selenic.com> parents: 8144 diff changeset	768 lui = ui.copy()
12637 42ca7aef28d3 dispatch: properly handle relative path aliases used with -R (issue2376) Brodie Rao <brodie@bitheap.org> parents: 12636 diff changeset	769 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	770
12536 208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	771 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	772
29132 12769703d4ba dispatch: always load extensions before running shell aliases (issue5230) Jun Wu <quark@fb.com> parents: 29129 diff changeset	773 def _checkshellalias(lui, ui, args):
12769703d4ba dispatch: always load extensions before running shell aliases (issue5230) Jun Wu <quark@fb.com> parents: 29129 diff changeset	774 """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	775 options = {}
12748 d10369fefd01 alias: fail gracefully when invalid global options are given (issue2442) Steve Losh <steve@stevelosh.com> parents: 12637 diff changeset	776
d10369fefd01 alias: fail gracefully when invalid global options are given (issue2442) Steve Losh <steve@stevelosh.com> parents: 12637 diff changeset	777 try:
d10369fefd01 alias: fail gracefully when invalid global options are given (issue2442) Steve Losh <steve@stevelosh.com> parents: 12637 diff changeset	778 args = fancyopts.fancyopts(args, commands.globalopts, options)
30581 541949a10a68 fancyopts: switch from fancyopts.getopt.* to getopt.* Pulkit Goyal <7895pulkit@gmail.com> parents: 30564 diff changeset	779 except getopt.GetoptError:
12748 d10369fefd01 alias: fail gracefully when invalid global options are given (issue2442) Steve Losh <steve@stevelosh.com> parents: 12637 diff changeset	780 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	781
208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	782 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	783 return
208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	784
29132 12769703d4ba dispatch: always load extensions before running shell aliases (issue5230) Jun Wu <quark@fb.com> parents: 29129 diff changeset	785 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	786
208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	787 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	788 try:
29132 12769703d4ba dispatch: always load extensions before running shell aliases (issue5230) Jun Wu <quark@fb.com> parents: 29129 diff changeset	789 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	790 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	791 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	792 return
208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	793
208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	794 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	795 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	796
14950 144e97421f6b dispatch: use safehasattr instead of hasattr Augie Fackler <durin42@gmail.com> parents: 14918 diff changeset	797 if cmd and util.safehasattr(fn, 'shell'):
34986 02845f7441af dispatch: verify result of early command parsing Yuya Nishihara <yuya@tcha.org> parents: 34985 diff changeset	798 # shell alias shouldn't receive early options which are consumed by hg
35234 7ce0ba3a1c32 dispatch: replace _earlygetopt(strip=True) with new parser Yuya Nishihara <yuya@tcha.org> parents: 35233 diff changeset	799 _earlyopts, args = _earlysplitopts(args)
12536 208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	800 d = lambda: fn(ui, *args[1:])
16683 525fdb738975 cleanup: eradicate long lines Brodie Rao <brodie@sf.io> parents: 16609 diff changeset	801 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	802 [], {})
12536 208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	803
14439 80c599eee3f3 dispatch: use the request to store the ui object Idan Kamara <idankk86@gmail.com> parents: 14438 diff changeset	804 def _dispatch(req):
14438 08bfec2ef031 dispatch: wrap dispatch related information in a request class Idan Kamara <idankk86@gmail.com> parents: 14286 diff changeset	805 args = req.args
14439 80c599eee3f3 dispatch: use the request to store the ui object Idan Kamara <idankk86@gmail.com> parents: 14438 diff changeset	806 ui = req.ui
80c599eee3f3 dispatch: use the request to store the ui object Idan Kamara <idankk86@gmail.com> parents: 14438 diff changeset	807
12536 208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	808 # check for cwd
35233 6e6d0a5b88e6 dispatch: replace _earlyreq() with new fancyopts-based parser Yuya Nishihara <yuya@tcha.org>* parents: 35232 diff changeset	809 cwd = req.earlyoptions['cwd']
12536 208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	810 if cwd:
34985 d3d35a55e03b dispatch: convert non-list option parsed by _earlygetopt() to string Yuya Nishihara <yuya@tcha.org> parents: 34984 diff changeset	811 os.chdir(cwd)
12536 208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	812
35233 6e6d0a5b88e6 dispatch: replace _earlyreq() with new fancyopts-based parser Yuya Nishihara <yuya@tcha.org>* parents: 35232 diff changeset	813 rpath = req.earlyoptions['repository']
12536 208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	814 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	815
32331 bd872f64a8ba cleanup: use set literals Martin von Zweigbergk <martinvonz@google.com> parents: 32207 diff changeset	816 uis = {ui, lui}
30953 69a3c6c8bf95 dispatch: move detection of profiling earlier during startup Bryan O'Sullivan <bryano@fb.com> parents: 30937 diff changeset	817
69a3c6c8bf95 dispatch: move detection of profiling earlier during startup Bryan O'Sullivan <bryano@fb.com> parents: 30937 diff changeset	818 if req.repo:
69a3c6c8bf95 dispatch: move detection of profiling earlier during startup Bryan O'Sullivan <bryano@fb.com> parents: 30937 diff changeset	819 uis.add(req.repo.ui)
69a3c6c8bf95 dispatch: move detection of profiling earlier during startup Bryan O'Sullivan <bryano@fb.com> parents: 30937 diff changeset	820
38535 b86664c81833 debug: process --debug flag earlier Boris Feld <boris.feld@octobus.net> parents: 38143 diff changeset	821 if (req.earlyoptions['verbose'] or req.earlyoptions['debug']
b86664c81833 debug: process --debug flag earlier Boris Feld <boris.feld@octobus.net> parents: 38143 diff changeset	822 or req.earlyoptions['quiet']):
b86664c81833 debug: process --debug flag earlier Boris Feld <boris.feld@octobus.net> parents: 38143 diff changeset	823 for opt in ('verbose', 'debug', 'quiet'):
b86664c81833 debug: process --debug flag earlier Boris Feld <boris.feld@octobus.net> parents: 38143 diff changeset	824 val = pycompat.bytestr(bool(req.earlyoptions[opt]))
b86664c81833 debug: process --debug flag earlier Boris Feld <boris.feld@octobus.net> parents: 38143 diff changeset	825 for ui_ in uis:
b86664c81833 debug: process --debug flag earlier Boris Feld <boris.feld@octobus.net> parents: 38143 diff changeset	826 ui_.setconfig('ui', opt, val, '--' + opt)
b86664c81833 debug: process --debug flag earlier Boris Feld <boris.feld@octobus.net> parents: 38143 diff changeset	827
35233 6e6d0a5b88e6 dispatch: replace _earlyreq() with new fancyopts-based parser Yuya Nishihara <yuya@tcha.org>* parents: 35232 diff changeset	828 if req.earlyoptions['profile']:
30953 69a3c6c8bf95 dispatch: move detection of profiling earlier during startup Bryan O'Sullivan <bryano@fb.com> parents: 30937 diff changeset	829 for ui_ in uis:
69a3c6c8bf95 dispatch: move detection of profiling earlier during startup Bryan O'Sullivan <bryano@fb.com> parents: 30937 diff changeset	830 ui_.setconfig('profiling', 'enabled', 'true', '--profile')
69a3c6c8bf95 dispatch: move detection of profiling earlier during startup Bryan O'Sullivan <bryano@fb.com> parents: 30937 diff changeset	831
32808 eede022fc142 profile: drop maybeprofile Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32807 diff changeset	832 profile = lui.configbool('profiling', 'enabled')
eede022fc142 profile: drop maybeprofile Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32807 diff changeset	833 with profiling.profile(lui, enabled=profile) as profiler:
30954 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	834 # Configure extensions in phases: uisetup, extsetup, cmdtable, and
33065 ef46d432e2e4 dispatch: remove unused _loaded FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 33064 diff changeset	835 # reposetup
30954 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	836 extensions.loadall(lui)
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	837 # Propagate any changes to lui.__class__ by extensions
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	838 ui.__class__ = lui.__class__
5828 863e237b58fb dispatch: allow extensions to provide setup code Kirill Smelkov <kirr@mns.spb.ru> parents: 5664 diff changeset	839
30954 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	840 # (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	841
30954 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	842 # (reposetup is handled in hg.repository)
9410 1c83938b6a8e extensions: load and configure extensions in well-defined phases Martin Geisler <mg@lazybytes.net> parents: 8936 diff changeset	843
30954 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	844 addaliases(lui, commands.table)
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	845
30954 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	846 # All aliases and commands are completely defined, now.
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	847 # Check abbreviation/ambiguity of shell alias.
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	848 shellaliasfn = _checkshellalias(lui, ui, args)
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	849 if shellaliasfn:
30010 b19c2679289c dispatch: make hg --profile wrap reposetup Arun Kulshreshtha <kulshrax@fb.com> parents: 30009 diff changeset	850 return shellaliasfn()
22377 f98abe3146b2 dispatch: check shell alias again after loading extensions (issue4355) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22376 diff changeset	851
30954 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	852 # check for fallback encoding
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	853 fallback = lui.config('ui', 'fallbackencoding')
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	854 if fallback:
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	855 encoding.fallbackencoding = fallback
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	856
30954 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	857 fullargs = args
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	858 cmd, func, args, options, cmdoptions = _parse(lui, args)
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	859
40402 106adc261492 logtoprocess: sends the canonical command name to the subprocess Boris Feld <boris.feld@octobus.net> parents: 39823 diff changeset	860 # store the canonical command name in request object for later access
106adc261492 logtoprocess: sends the canonical command name to the subprocess Boris Feld <boris.feld@octobus.net> parents: 39823 diff changeset	861 req.canonical_command = cmd
106adc261492 logtoprocess: sends the canonical command name to the subprocess Boris Feld <boris.feld@octobus.net> parents: 39823 diff changeset	862
34986 02845f7441af dispatch: verify result of early command parsing Yuya Nishihara <yuya@tcha.org> parents: 34985 diff changeset	863 if options["config"] != req.earlyoptions["config"]:
30954 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	864 raise error.Abort(_("option --config may not be abbreviated!"))
34986 02845f7441af dispatch: verify result of early command parsing Yuya Nishihara <yuya@tcha.org> parents: 34985 diff changeset	865 if options["cwd"] != req.earlyoptions["cwd"]:
30954 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	866 raise error.Abort(_("option --cwd may not be abbreviated!"))
34986 02845f7441af dispatch: verify result of early command parsing Yuya Nishihara <yuya@tcha.org> parents: 34985 diff changeset	867 if options["repository"] != req.earlyoptions["repository"]:
30954 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	868 raise error.Abort(_(
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	869 "option -R has to be separated from other options (e.g. not "
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	870 "-qR) and --repository may only be abbreviated as --repo!"))
34982 d9aba3730d30 dispatch: abort if early boolean options can't be parsed Yuya Nishihara <yuya@tcha.org> parents: 34981 diff changeset	871 if options["debugger"] != req.earlyoptions["debugger"]:
d9aba3730d30 dispatch: abort if early boolean options can't be parsed Yuya Nishihara <yuya@tcha.org> parents: 34981 diff changeset	872 raise error.Abort(_("option --debugger may not be abbreviated!"))
d9aba3730d30 dispatch: abort if early boolean options can't be parsed Yuya Nishihara <yuya@tcha.org> parents: 34981 diff changeset	873 # don't validate --profile/--traceback, which can be enabled from now
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	874
30954 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	875 if options["encoding"]:
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	876 encoding.encoding = options["encoding"]
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	877 if options["encodingmode"]:
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	878 encoding.encodingmode = options["encodingmode"]
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	879 if options["time"]:
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	880 def get_times():
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	881 t = os.times()
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	882 if t[4] == 0.0:
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	883 # Windows leaves this as zero, so use time.clock()
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	884 t = (t[0], t[1], t[2], t[3], time.clock())
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	885 return t
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	886 s = get_times()
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	887 def print_time():
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	888 t = get_times()
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	889 ui.warn(
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	890 _("time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n") %
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	891 (t[4]-s[4], t[0]-s[0], t[2]-s[2], t[1]-s[1], t[3]-s[3]))
31958 de5c9d0e02ea atexit: switch to home-grown implementation Bryan O'Sullivan <bryano@fb.com> parents: 31956 diff changeset	892 ui.atexit(print_time)
32807 545f69cd6042 profile: support --profile in alias and abbreviated version (--prof) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32707 diff changeset	893 if options["profile"]:
545f69cd6042 profile: support --profile in alias and abbreviated version (--prof) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32707 diff changeset	894 profiler.start()
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	895
38535 b86664c81833 debug: process --debug flag earlier Boris Feld <boris.feld@octobus.net> parents: 38143 diff changeset	896 # if abbreviated version of this were used, take them in account, now
30954 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	897 if options['verbose'] or options['debug'] or options['quiet']:
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	898 for opt in ('verbose', 'debug', 'quiet'):
38535 b86664c81833 debug: process --debug flag earlier Boris Feld <boris.feld@octobus.net> parents: 38143 diff changeset	899 if options[opt] == req.earlyoptions[opt]:
b86664c81833 debug: process --debug flag earlier Boris Feld <boris.feld@octobus.net> parents: 38143 diff changeset	900 continue
35938 a2b3b5c5a25a py3: replace "if ispy3" by pycompat.bytestr() Yuya Nishihara <yuya@tcha.org> parents: 35653 diff changeset	901 val = pycompat.bytestr(bool(options[opt]))
30954 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	902 for ui_ in uis:
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	903 ui_.setconfig('ui', opt, val, '--' + opt)
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	904
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	905 if options['traceback']:
14752 99ace3cb7352 dispatch: set global options on the request repo.ui Idan Kamara <idankk86@gmail.com> parents: 14748 diff changeset	906 for ui_ in uis:
30954 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	907 ui_.setconfig('ui', 'traceback', 'on', '--traceback')
14992 188936b334b1 dispatch: make sure global options on the command line take precedence Idan Kamara <idankk86@gmail.com> parents: 14914 diff changeset	908
30954 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	909 if options['noninteractive']:
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	910 for ui_ in uis:
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	911 ui_.setconfig('ui', 'interactive', 'off', '-y')
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	912
30954 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	913 if cmdoptions.get('insecure', False):
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	914 for ui_ in uis:
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	915 ui_.insecureconnections = True
13328 a939f08fae9c url: add --insecure option to bypass verification of ssl certificates Yuya Nishihara <yuya@tcha.org> parents: 12932 diff changeset	916
32125 f928d53b687c dispatch: setup color before pager for correct console information on windows FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32054 diff changeset	917 # setup color handling before pager, because setting up pager
f928d53b687c dispatch: setup color before pager for correct console information on windows FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32054 diff changeset	918 # might cause incorrect console information
31127 7fec37746417 color: add a 'ui.color' option to control color behavior Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31122 diff changeset	919 coloropt = options['color']
31122 45be7590301d color: move triggering of the initialisation logic in core Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31080 diff changeset	920 for ui_ in uis:
31127 7fec37746417 color: add a 'ui.color' option to control color behavior Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31122 diff changeset	921 if coloropt:
7fec37746417 color: add a 'ui.color' option to control color behavior Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31122 diff changeset	922 ui_.setconfig('ui', 'color', coloropt, '--color')
7fec37746417 color: add a 'ui.color' option to control color behavior Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31122 diff changeset	923 color.setup(ui_)
31122 45be7590301d color: move triggering of the initialisation logic in core Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31080 diff changeset	924
37087 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36752 diff changeset	925 if stringutil.parsebool(options['pager']):
33618 cc047a733f69 ui: enable pager always for explicit --pager=on (issue5580) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 33499 diff changeset	926 # ui.pager() expects 'internal-always-' prefix in this case
32125 f928d53b687c dispatch: setup color before pager for correct console information on windows FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32054 diff changeset	927 ui.pager('internal-always-' + cmd)
f928d53b687c dispatch: setup color before pager for correct console information on windows FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32054 diff changeset	928 elif options['pager'] != 'auto':
34638 021607b4ef49 dispatch: when --pager=no is passed, also disable pager on req.repo.ui Jun Wu <quark@fb.com> parents: 34533 diff changeset	929 for ui_ in uis:
021607b4ef49 dispatch: when --pager=no is passed, also disable pager on req.repo.ui Jun Wu <quark@fb.com> parents: 34533 diff changeset	930 ui_.disablepager()
32125 f928d53b687c dispatch: setup color before pager for correct console information on windows FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32054 diff changeset	931
30954 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	932 if options['version']:
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	933 return commands.version_(ui)
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	934 if options['help']:
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	935 return commands.help_(ui, cmd, command=cmd is not None)
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	936 elif not cmd:
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	937 return commands.help_(ui, 'shortlist')
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	938
30009 dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	939 repo = None
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	940 cmdpats = args[:]
30494 acd30a959980 dispatch: stop supporting non-use of @command Augie Fackler <augie@google.com> parents: 30482 diff changeset	941 if not func.norepo:
30009 dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	942 # use the repo from the request only if we don't have -R
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	943 if not rpath and not cwd:
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	944 repo = req.repo
14510 eccbb9980ada dispatch: add repo to the request Idan Kamara <idankk86@gmail.com> parents: 14439 diff changeset	945
30009 dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	946 if repo:
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	947 # set the descriptors of the repo ui to those of ui
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	948 repo.ui.fin = ui.fin
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	949 repo.ui.fout = ui.fout
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	950 repo.ui.ferr = ui.ferr
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	951 else:
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	952 try:
32418 71e735bd8170 dispatch: make request accept additional reposetups Jun Wu <quark@fb.com> parents: 32416 diff changeset	953 repo = hg.repository(ui, path=path,
37717 0664be4f0c1f hg: pass command intents to repo/peer creation (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37716 diff changeset	954 presetupfuncs=req.prereposetups,
0664be4f0c1f hg: pass command intents to repo/peer creation (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37716 diff changeset	955 intents=func.intents)
30009 dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	956 if not repo.local():
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	957 raise error.Abort(_("repository '%s' is not local")
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	958 % path)
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	959 repo.ui.setconfig("bundle", "mainreporoot", repo.root,
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	960 'repo')
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	961 except error.RequirementError:
26142 7332bf4ae959 dispatch: error out on invalid -R path even if optionalrepo (issue4805) (BC) Yuya Nishihara <yuya@tcha.org> parents: 25932 diff changeset	962 raise
30009 dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	963 except error.RepoError:
34985 d3d35a55e03b dispatch: convert non-list option parsed by _earlygetopt() to string Yuya Nishihara <yuya@tcha.org> parents: 34984 diff changeset	964 if rpath: # invalid -R path
30009 dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	965 raise
30494 acd30a959980 dispatch: stop supporting non-use of @command Augie Fackler <augie@google.com> parents: 30482 diff changeset	966 if not func.optionalrepo:
acd30a959980 dispatch: stop supporting non-use of @command Augie Fackler <augie@google.com> parents: 30482 diff changeset	967 if func.inferrepo and args and not path:
30009 dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	968 # try to infer -R from command args
35170 e6487522ef92 py3: use pycompat.maplist() instead of map() Pulkit Goyal <7895pulkit@gmail.com> parents: 35166 diff changeset	969 repos = pycompat.maplist(cmdutil.findrepo, args)
30009 dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	970 guess = repos[0]
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	971 if guess and repos.count(guess) == len(repos):
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	972 req.args = ['--repository', guess] + fullargs
35233 6e6d0a5b88e6 dispatch: replace _earlyreq() with new fancyopts-based parser Yuya Nishihara <yuya@tcha.org>* parents: 35232 diff changeset	973 req.earlyoptions['repository'] = guess
30009 dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	974 return _dispatch(req)
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	975 if not path:
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	976 raise error.RepoError(_("no repository found in"
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	977 " '%s' (.hg not found)")
39823 24e493ec2229 py3: rename pycompat.getcwd() to encoding.getcwd() (API) Matt Harbison <matt_harbison@yahoo.com> parents: 39529 diff changeset	978 % encoding.getcwd())
30009 dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	979 raise
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	980 if repo:
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	981 ui = repo.ui
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	982 if options['hidden']:
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	983 repo = repo.unfiltered()
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	984 args.insert(0, repo)
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	985 elif rpath:
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	986 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	987
31499 3c77414a0f9c dispatch: consolidate formatting of arguments Augie Fackler <augie@google.com> parents: 31498 diff changeset	988 msg = _formatargs(fullargs)
30009 dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	989 ui.log("command", '%s\n', msg)
30591 2d555d753f0e py3: make keys of keyword arguments strings Pulkit Goyal <7895pulkit@gmail.com> parents: 30581 diff changeset	990 strcmdopt = pycompat.strkwargs(cmdoptions)
2d555d753f0e py3: make keys of keyword arguments strings Pulkit Goyal <7895pulkit@gmail.com> parents: 30581 diff changeset	991 d = lambda: util.checksignature(func)(ui, args, *strcmdopt)
30009 dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	992 try:
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	993 return runcommand(lui, repo, cmd, fullargs, ui, options, d,
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	994 cmdpats, cmdoptions)
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	995 finally:
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	996 if repo and repo != req.repo:
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	997 repo.close()
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	998
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	999 def _runcommand(ui, options, cmd, cmdfunc):
29795 e3501546f7e4 profiling: add a context manager that no-ops if profiling isn't enabled Gregory Szorc <gregory.szorc@gmail.com> parents: 29794 diff changeset	1000 """Run a command function, possibly with profiling enabled."""
30010 b19c2679289c dispatch: make hg --profile wrap reposetup Arun Kulshreshtha <kulshrax@fb.com> parents: 30009 diff changeset	1001 try:
39529 ec0a2601bc76 tracing: trace command function execution Boris Feld <boris.feld@octobus.net> parents: 39283 diff changeset	1002 with tracing.log("Running %s command" % cmd):
ec0a2601bc76 tracing: trace command function execution Boris Feld <boris.feld@octobus.net> parents: 39283 diff changeset	1003 return cmdfunc()
30010 b19c2679289c dispatch: make hg --profile wrap reposetup Arun Kulshreshtha <kulshrax@fb.com> parents: 30009 diff changeset	1004 except error.SignatureError:
b19c2679289c dispatch: make hg --profile wrap reposetup Arun Kulshreshtha <kulshrax@fb.com> parents: 30009 diff changeset	1005 raise error.CommandError(cmd, _('invalid arguments'))
28784 09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1006
28821 d3369dc6c1d0 dispatch: split out warning message generation to separate function Martijn Pieters <mjpieters@fb.com> parents: 28784 diff changeset	1007 def _exceptionwarning(ui):
d3369dc6c1d0 dispatch: split out warning message generation to separate function Martijn Pieters <mjpieters@fb.com> parents: 28784 diff changeset	1008 """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	1009
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1010 # 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	1011 # 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	1012 # 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	1013 # 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	1014 # '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	1015 # 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	1016 # version number and try updating.
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1017 ct = util.versiontuple(n=2)
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1018 worst = None, ct, ''
33499 0407a51b9d8c codemod: register core configitems using a script Jun Wu <quark@fb.com> parents: 33065 diff changeset	1019 if ui.config('ui', 'supportcontact') is None:
28784 09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1020 for name, mod in extensions.extensions():
35939 d5457d94e1c9 py3: replace "if ispy3" by pycompat.sysbytes() or util.forcebytestr() Yuya Nishihara <yuya@tcha.org> parents: 35938 diff changeset	1021 # 'testedwith' should be bytes, but not all extensions are ported
d5457d94e1c9 py3: replace "if ispy3" by pycompat.sysbytes() or util.forcebytestr() Yuya Nishihara <yuya@tcha.org> parents: 35938 diff changeset	1022 # to py3 and we don't want UnicodeException because of that.
37087 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36752 diff changeset	1023 testedwith = stringutil.forcebytestr(getattr(mod, 'testedwith', ''))
28784 09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1024 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	1025 if not testedwith.strip():
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1026 # 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	1027 worst = name, 'unknown', report
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1028 break
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1029
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1030 # Never blame on extensions bundled with Mercurial.
29888 ed793f41e83f extensions: use ismoduleinternal() thoroughly Yuya Nishihara <yuya@tcha.org> parents: 29857 diff changeset	1031 if extensions.ismoduleinternal(mod):
28784 09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1032 continue
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1033
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1034 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	1035 if ct in tested:
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1036 continue
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1037
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1038 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	1039 nearest = max(lower or tested)
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1040 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	1041 worst = name, nearest, report
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1042 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	1043 name, testedwith, report = worst
31189 49ad6bf63107 dispatch: allow testedwith to be bytes or str Augie Fackler <raf@durin42.com> parents: 31127 diff changeset	1044 if not isinstance(testedwith, (bytes, str)):
37087 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36752 diff changeset	1045 testedwith = '.'.join([stringutil.forcebytestr(c)
f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36752 diff changeset	1046 for c in testedwith])
28784 09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1047 warning = (_('** Unknown exception encountered with '
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1048 '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	1049 '** 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	1050 '** 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	1051 '** If that fixes the bug please report it to %s\n')
38067 5046c906b25d py3: convert the report to bytes Pulkit Goyal <7895pulkit@gmail.com> parents: 38065 diff changeset	1052 % (name, testedwith, name, stringutil.forcebytestr(report)))
28784 09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1053 else:
33499 0407a51b9d8c codemod: register core configitems using a script Jun Wu <quark@fb.com> parents: 33065 diff changeset	1054 bugtracker = ui.config('ui', 'supportcontact')
28784 09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1055 if bugtracker is None:
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1056 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	1057 warning = (_("** unknown exception encountered, "
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1058 "please report by visiting\n** ") + bugtracker + '\n')
35939 d5457d94e1c9 py3: replace "if ispy3" by pycompat.sysbytes() or util.forcebytestr() Yuya Nishihara <yuya@tcha.org> parents: 35938 diff changeset	1059 sysversion = pycompat.sysbytes(sys.version).replace('\n', '')
31190 27e3b66ec7c5 dispatch: cope with sys.version being unicode on Python 3 Augie Fackler <raf@durin42.com> parents: 31189 diff changeset	1060 warning += ((_("** Python %s\n") % sysversion) +
28784 09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1061 (_("** 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	1062 util.version()) +
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1063 (_("** Extensions loaded: %s\n") %
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1064 ", ".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	1065 return warning
d3369dc6c1d0 dispatch: split out warning message generation to separate function Martijn Pieters <mjpieters@fb.com> parents: 28784 diff changeset	1066
d3369dc6c1d0 dispatch: split out warning message generation to separate function Martijn Pieters <mjpieters@fb.com> parents: 28784 diff changeset	1067 def handlecommandexception(ui):
d3369dc6c1d0 dispatch: split out warning message generation to separate function Martijn Pieters <mjpieters@fb.com> parents: 28784 diff changeset	1068 """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	1069
d3369dc6c1d0 dispatch: split out warning message generation to separate function Martijn Pieters <mjpieters@fb.com> parents: 28784 diff changeset	1070 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	1071 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	1072 """
d3369dc6c1d0 dispatch: split out warning message generation to separate function Martijn Pieters <mjpieters@fb.com> parents: 28784 diff changeset	1073 warning = _exceptionwarning(ui)
36162 976a9fd706ed py3: convert traceback representation to bytes when logging Gregory Szorc <gregory.szorc@gmail.com> parents: 35982 diff changeset	1074 ui.log("commandexception", "%s\n%s\n", warning,
976a9fd706ed py3: convert traceback representation to bytes when logging Gregory Szorc <gregory.szorc@gmail.com> parents: 35982 diff changeset	1075 pycompat.sysbytes(traceback.format_exc()))
28784 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 @ 40402:106adc261492