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

annotate mercurial/dispatch.py @ 43076:2372284d9457

formatting: blacken the codebase This is using my patch to black (https://github.com/psf/black/pull/826) so we don't un-wrap collection literals. Done with: hg files 'set:**.py - mercurial/thirdparty/** - "contrib/python-zstandard/**"' | xargs black -S # skip-blame mass-reformatting only # no-check-commit reformats foo_bar functions Differential Revision: https://phab.mercurial-scm.org/D6971

author	Augie Fackler <augie@google.com>
date	Sun, 06 Oct 2019 09:45:02 -0400
parents	dd97354b8891
children	687b865b95ad

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,
40490 444861dc1e55 help: displaying documented aliases by default rdamazio@google.com parents: 40402 diff changeset	40 registrar,
30529 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30528 diff changeset	41 scmutil,
25932 d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	42 ui as uimod,
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	43 util,
d491f289045f dispatch: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25834 diff changeset	44 )
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	45
37087 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36752 diff changeset	46 from .utils import (
37122 d4a2e0d5d042 procutil: bulk-replace util.std* to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37087 diff changeset	47 procutil,
37087 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36752 diff changeset	48 stringutil,
f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36752 diff changeset	49 )
f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36752 diff changeset	50
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	51
14438 08bfec2ef031 dispatch: wrap dispatch related information in a request class Idan Kamara <idankk86@gmail.com> parents: 14286 diff changeset	52 class request(object):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	53 def __init__(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	54 self,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	55 args,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	56 ui=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	57 repo=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	58 fin=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	59 fout=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	60 ferr=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	61 fmsg=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	62 prereposetups=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	63 ):
14438 08bfec2ef031 dispatch: wrap dispatch related information in a request class Idan Kamara <idankk86@gmail.com> parents: 14286 diff changeset	64 self.args = args
14439 80c599eee3f3 dispatch: use the request to store the ui object Idan Kamara <idankk86@gmail.com> parents: 14438 diff changeset	65 self.ui = ui
14510 eccbb9980ada dispatch: add repo to the request Idan Kamara <idankk86@gmail.com> parents: 14439 diff changeset	66 self.repo = repo
14438 08bfec2ef031 dispatch: wrap dispatch related information in a request class Idan Kamara <idankk86@gmail.com> parents: 14286 diff changeset	67
14613 ea8938d3a5aa dispatch: add I/O descriptors to the request Idan Kamara <idankk86@gmail.com> parents: 14601 diff changeset	68 # input/output/error streams
ea8938d3a5aa dispatch: add I/O descriptors to the request Idan Kamara <idankk86@gmail.com> parents: 14601 diff changeset	69 self.fin = fin
ea8938d3a5aa dispatch: add I/O descriptors to the request Idan Kamara <idankk86@gmail.com> parents: 14601 diff changeset	70 self.fout = fout
ea8938d3a5aa dispatch: add I/O descriptors to the request Idan Kamara <idankk86@gmail.com> parents: 14601 diff changeset	71 self.ferr = ferr
40634 5542bc9125c9 dispatch: pass around ui.fmsg channel Yuya Nishihara <yuya@tcha.org> parents: 40490 diff changeset	72 # separate stream for status/error messages
5542bc9125c9 dispatch: pass around ui.fmsg channel Yuya Nishihara <yuya@tcha.org> parents: 40490 diff changeset	73 self.fmsg = fmsg
14613 ea8938d3a5aa dispatch: add I/O descriptors to the request Idan Kamara <idankk86@gmail.com> parents: 14601 diff changeset	74
35233 6e6d0a5b88e6 dispatch: replace _earlyreq() with new fancyopts-based parser Yuya Nishihara <yuya@tcha.org>* parents: 35232 diff changeset	75 # 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	76 self.earlyoptions = {}
d9aba3730d30 dispatch: abort if early boolean options can't be parsed Yuya Nishihara <yuya@tcha.org> parents: 34981 diff changeset	77
32418 71e735bd8170 dispatch: make request accept additional reposetups Jun Wu <quark@fb.com> parents: 32416 diff changeset	78 # 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	79 # 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	80 self.prereposetups = prereposetups or []
71e735bd8170 dispatch: make request accept additional reposetups Jun Wu <quark@fb.com> parents: 32416 diff changeset	81
40402 106adc261492 logtoprocess: sends the canonical command name to the subprocess Boris Feld <boris.feld@octobus.net> parents: 39823 diff changeset	82 # 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	83 self.canonical_command = None
106adc261492 logtoprocess: sends the canonical command name to the subprocess Boris Feld <boris.feld@octobus.net> parents: 39823 diff changeset	84
31956 c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31634 diff changeset	85 def _runexithandlers(self):
c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31634 diff changeset	86 exc = None
c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31634 diff changeset	87 handlers = self.ui._exithandlers
c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31634 diff changeset	88 try:
c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31634 diff changeset	89 while handlers:
c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31634 diff changeset	90 func, args, kwargs = handlers.pop()
c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31634 diff changeset	91 try:
c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31634 diff changeset	92 func(args, *kwargs)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	93 except: # re-raises below
31956 c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31634 diff changeset	94 if exc is None:
c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31634 diff changeset	95 exc = sys.exc_info()[1]
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	96 self.ui.warn('error in exit handlers:\n')
31956 c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31634 diff changeset	97 self.ui.traceback(force=True)
c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31634 diff changeset	98 finally:
c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31634 diff changeset	99 if exc is not None:
c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31634 diff changeset	100 raise exc
c13ff31818b0 ui: add special-purpose atexit functionality Bryan O'Sullivan <bryano@fb.com> parents: 31634 diff changeset	101
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	102
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	103 def run():
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	104 "run the command in sys.argv"
37988 dc1ed7fe33e4 sshserver: do setbinary() by caller (API) Yuya Nishihara <yuya@tcha.org> parents: 37717 diff changeset	105 initstdio()
39283 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	106 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	107 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	108 err = None
71dcd4a4fa2f stdio: catch StdioError in dispatch.run and clean up appropriately Bryan O'Sullivan <bryano@fb.com> parents: 31958 diff changeset	109 try:
38038 6f9ac3cb0987 dispatch: unify handling of None returned by a command function Yuya Nishihara <yuya@tcha.org> parents: 38037 diff changeset	110 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	111 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	112 err = e
31960 71dcd4a4fa2f stdio: catch StdioError in dispatch.run and clean up appropriately Bryan O'Sullivan <bryano@fb.com> parents: 31958 diff changeset	113 status = -1
38037 e9c588802529 dispatch: minor code refactor Gregory Szorc <gregory.szorc@gmail.com> parents: 37988 diff changeset	114
e9c588802529 dispatch: minor code refactor Gregory Szorc <gregory.szorc@gmail.com> parents: 37988 diff changeset	115 # 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	116 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	117 try:
32707 12941a782928 dispatch: do not close stdout and stderr, just flush() instead Yuya Nishihara <yuya@tcha.org> parents: 32674 diff changeset	118 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	119 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	120 err = e
31960 71dcd4a4fa2f stdio: catch StdioError in dispatch.run and clean up appropriately Bryan O'Sullivan <bryano@fb.com> parents: 31958 diff changeset	121 status = -1
38037 e9c588802529 dispatch: minor code refactor Gregory Szorc <gregory.szorc@gmail.com> parents: 37988 diff changeset	122
31960 71dcd4a4fa2f stdio: catch StdioError in dispatch.run and clean up appropriately Bryan O'Sullivan <bryano@fb.com> parents: 31958 diff changeset	123 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	124 try:
48fe4f56a3b4 dispatch: handle IOError when writing to stderr Gregory Szorc <gregory.szorc@gmail.com> parents: 35470 diff changeset	125 if err is not None and err.errno != errno.EPIPE:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	126 req.ui.ferr.write(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	127 'abort: %s\n' % encoding.strtolocal(err.strerror)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	128 )
35653 48fe4f56a3b4 dispatch: handle IOError when writing to stderr Gregory Szorc <gregory.szorc@gmail.com> parents: 35470 diff changeset	129 req.ui.ferr.flush()
48fe4f56a3b4 dispatch: handle IOError when writing to stderr Gregory Szorc <gregory.szorc@gmail.com> parents: 35470 diff changeset	130 # 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	131 # 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	132 except IOError:
48fe4f56a3b4 dispatch: handle IOError when writing to stderr Gregory Szorc <gregory.szorc@gmail.com> parents: 35470 diff changeset	133 status = -1
36666 e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36665 diff changeset	134
e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36665 diff changeset	135 _silencestdio()
31960 71dcd4a4fa2f stdio: catch StdioError in dispatch.run and clean up appropriately Bryan O'Sullivan <bryano@fb.com> parents: 31958 diff changeset	136 sys.exit(status & 255)
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	137
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	138
36665 c263c684da91 py3: conditionalize initialization of stdio flags Yuya Nishihara <yuya@tcha.org> parents: 36533 diff changeset	139 if pycompat.ispy3:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	140
37988 dc1ed7fe33e4 sshserver: do setbinary() by caller (API) Yuya Nishihara <yuya@tcha.org> parents: 37717 diff changeset	141 def initstdio():
36665 c263c684da91 py3: conditionalize initialization of stdio flags Yuya Nishihara <yuya@tcha.org> parents: 36533 diff changeset	142 pass
36666 e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36665 diff changeset	143
e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36665 diff changeset	144 def _silencestdio():
e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36665 diff changeset	145 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	146 # 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	147 try:
e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36665 diff changeset	148 fp.flush()
e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36665 diff changeset	149 continue
e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36665 diff changeset	150 except IOError:
e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36665 diff changeset	151 pass
e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36665 diff changeset	152 # 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	153 # 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	154 # 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	155 # 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	156 try:
e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36665 diff changeset	157 fp.close()
e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36665 diff changeset	158 except IOError:
e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36665 diff changeset	159 pass
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	160
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	161
36665 c263c684da91 py3: conditionalize initialization of stdio flags Yuya Nishihara <yuya@tcha.org> parents: 36533 diff changeset	162 else:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	163
37988 dc1ed7fe33e4 sshserver: do setbinary() by caller (API) Yuya Nishihara <yuya@tcha.org> parents: 37717 diff changeset	164 def initstdio():
36665 c263c684da91 py3: conditionalize initialization of stdio flags Yuya Nishihara <yuya@tcha.org> parents: 36533 diff changeset	165 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	166 procutil.setbinary(fp)
34533 163fa0aea71e dispatch: move initialization of sys.std* files Yuya Nishihara <yuya@tcha.org> parents: 34532 diff changeset	167
36666 e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36665 diff changeset	168 def _silencestdio():
e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36665 diff changeset	169 pass
e8c361316803 py3: silence the final IOError by closing stdout/err slightly early Yuya Nishihara <yuya@tcha.org> parents: 36665 diff changeset	170
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	171
24221 4e240d6ab898 dispatch: offer near-edit-distance suggestions for {file,rev}set functions Augie Fackler <augie@google.com> parents: 24163 diff changeset	172 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	173 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	174 # 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	175 # 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	176 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	177
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	178
27623 b3376fba4ab9 dispatch: report similar names consistently Bryan O'Sullivan <bos@serpentine.com> parents: 27615 diff changeset	179 def _reportsimilar(write, similar):
b3376fba4ab9 dispatch: report similar names consistently Bryan O'Sullivan <bos@serpentine.com> parents: 27615 diff changeset	180 if len(similar) == 1:
b3376fba4ab9 dispatch: report similar names consistently Bryan O'Sullivan <bos@serpentine.com> parents: 27615 diff changeset	181 write(_("(did you mean %s?)\n") % similar[0])
b3376fba4ab9 dispatch: report similar names consistently Bryan O'Sullivan <bos@serpentine.com> parents: 27615 diff changeset	182 elif similar:
b3376fba4ab9 dispatch: report similar names consistently Bryan O'Sullivan <bos@serpentine.com> parents: 27615 diff changeset	183 ss = ", ".join(sorted(similar))
b3376fba4ab9 dispatch: report similar names consistently Bryan O'Sullivan <bos@serpentine.com> parents: 27615 diff changeset	184 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	185
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	186
24039 2ee35b6ee4fb dispatch: consolidate formatting of ParseErrors Augie Fackler <augie@google.com> parents: 23871 diff changeset	187 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	188 similar = []
4e240d6ab898 dispatch: offer near-edit-distance suggestions for {file,rev}set functions Augie Fackler <augie@google.com> parents: 24163 diff changeset	189 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	190 # 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	191 similar = _getsimilar(inst.symbols, inst.function)
24039 2ee35b6ee4fb dispatch: consolidate formatting of ParseErrors Augie Fackler <augie@google.com> parents: 23871 diff changeset	192 if len(inst.args) > 1:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	193 write(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	194 _("hg: parse error at %s: %s\n")
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	195 % (pycompat.bytestr(inst.args[1]), inst.args[0])
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	196 )
36752 389b950f5190 py3: use startswith() instead of slicing to detect leading whitespace Yuya Nishihara <yuya@tcha.org> parents: 36743 diff changeset	197 if inst.args[0].startswith(' '):
24039 2ee35b6ee4fb dispatch: consolidate formatting of ParseErrors Augie Fackler <augie@google.com> parents: 23871 diff changeset	198 write(_("unexpected leading whitespace\n"))
2ee35b6ee4fb dispatch: consolidate formatting of ParseErrors Augie Fackler <augie@google.com> parents: 23871 diff changeset	199 else:
2ee35b6ee4fb dispatch: consolidate formatting of ParseErrors Augie Fackler <augie@google.com> parents: 23871 diff changeset	200 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	201 _reportsimilar(write, similar)
28515 491eabd0df79 dispatch: extract common logic for handling ParseError Jun Wu <quark@fb.com> parents: 28447 diff changeset	202 if inst.hint:
491eabd0df79 dispatch: extract common logic for handling ParseError Jun Wu <quark@fb.com> parents: 28447 diff changeset	203 write(_("(%s)\n") % inst.hint)
24039 2ee35b6ee4fb dispatch: consolidate formatting of ParseErrors Augie Fackler <augie@google.com> parents: 23871 diff changeset	204
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	205
31499 3c77414a0f9c dispatch: consolidate formatting of arguments Augie Fackler <augie@google.com> parents: 31498 diff changeset	206 def _formatargs(args):
37123 a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37122 diff changeset	207 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	208
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	209
14438 08bfec2ef031 dispatch: wrap dispatch related information in a request class Idan Kamara <idankk86@gmail.com> parents: 14286 diff changeset	210 def dispatch(req):
38038 6f9ac3cb0987 dispatch: unify handling of None returned by a command function Yuya Nishihara <yuya@tcha.org> parents: 38037 diff changeset	211 """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	212 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	213 if req.ferr:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	214 ferr = req.ferr
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	215 elif req.ui:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	216 ferr = req.ui.ferr
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	217 else:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	218 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	219
39283 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	220 try:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	221 if not req.ui:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	222 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	223 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	224 if req.earlyoptions['traceback']:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	225 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	226
39283 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	227 # 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	228 if req.fin:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	229 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	230 if req.fout:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	231 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	232 if req.ferr:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	233 req.ui.ferr = req.ferr
40634 5542bc9125c9 dispatch: pass around ui.fmsg channel Yuya Nishihara <yuya@tcha.org> parents: 40490 diff changeset	234 if req.fmsg:
5542bc9125c9 dispatch: pass around ui.fmsg channel Yuya Nishihara <yuya@tcha.org> parents: 40490 diff changeset	235 req.ui.fmsg = req.fmsg
39283 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	236 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	237 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	238 if inst.hint:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	239 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	240 return -1
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	241 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	242 _formatparse(ferr.write, inst)
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	243 return -1
14615 9fba795dd030 dispatch: assign I/O descriptors from the request to the ui Idan Kamara <idankk86@gmail.com> parents: 14613 diff changeset	244
39283 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	245 msg = _formatargs(req.args)
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	246 starttime = util.timer()
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	247 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	248 try:
39283 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	249 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	250 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	251 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	252 if inst.hint:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	253 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	254 raise
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	255 except KeyboardInterrupt as inst:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	256 try:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	257 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	258 msg = _("killed!\n")
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	259 else:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	260 msg = _("interrupted!\n")
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	261 req.ui.error(msg)
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	262 except error.SignalInterrupt:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	263 # 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	264 # 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	265 pass
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	266 except IOError as inst:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	267 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	268 raise
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	269 ret = -1
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	270 finally:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	271 duration = util.timer() - starttime
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	272 req.ui.flush()
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	273 if req.ui.logblockedtimes:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	274 req.ui._blockedtimes['command_duration'] = duration * 1000
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	275 req.ui.log(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	276 'uiblocked',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	277 'ui blocked ms\n',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	278 **pycompat.strkwargs(req.ui._blockedtimes)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	279 )
40694 1243295fcc3a logtoprocess: update commandfinish options arguments Boris Feld <boris.feld@octobus.net> parents: 40634 diff changeset	280 return_code = ret & 255
1243295fcc3a logtoprocess: update commandfinish options arguments Boris Feld <boris.feld@octobus.net> parents: 40634 diff changeset	281 req.ui.log(
1243295fcc3a logtoprocess: update commandfinish options arguments Boris Feld <boris.feld@octobus.net> parents: 40634 diff changeset	282 "commandfinish",
1243295fcc3a logtoprocess: update commandfinish options arguments Boris Feld <boris.feld@octobus.net> parents: 40634 diff changeset	283 "%s exited %d after %0.2f seconds\n",
1243295fcc3a logtoprocess: update commandfinish options arguments Boris Feld <boris.feld@octobus.net> parents: 40634 diff changeset	284 msg,
1243295fcc3a logtoprocess: update commandfinish options arguments Boris Feld <boris.feld@octobus.net> parents: 40634 diff changeset	285 return_code,
1243295fcc3a logtoprocess: update commandfinish options arguments Boris Feld <boris.feld@octobus.net> parents: 40634 diff changeset	286 duration,
1243295fcc3a logtoprocess: update commandfinish options arguments Boris Feld <boris.feld@octobus.net> parents: 40634 diff changeset	287 return_code=return_code,
1243295fcc3a logtoprocess: update commandfinish options arguments Boris Feld <boris.feld@octobus.net> parents: 40634 diff changeset	288 duration=duration,
1243295fcc3a logtoprocess: update commandfinish options arguments Boris Feld <boris.feld@octobus.net> parents: 40634 diff changeset	289 canonical_command=req.canonical_command,
1243295fcc3a logtoprocess: update commandfinish options arguments Boris Feld <boris.feld@octobus.net> parents: 40634 diff changeset	290 )
39283 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	291 try:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	292 req._runexithandlers()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	293 except: # exiting, so no re-raises
39283 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	294 ret = ret or -1
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	295 return ret
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	296
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	297
14439 80c599eee3f3 dispatch: use the request to store the ui object Idan Kamara <idankk86@gmail.com> parents: 14438 diff changeset	298 def _runcatch(req):
39283 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	299 with tracing.log('dispatch._runcatch'):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	300
39283 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	301 def catchterm(*args):
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	302 raise error.SignalInterrupt
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: 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 ui = req.ui
32050 77eaf9539499 dispatch: protect against malicious 'hg serve --stdio' invocations (sec) Augie Fackler <augie@google.com> parents: 30681 diff changeset	305 try:
39283 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	306 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	307 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	308 if num:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	309 signal.signal(num, catchterm)
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	310 except ValueError:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	311 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	312
39283 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	313 def _runcatchfunc():
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	314 realcmd = None
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	315 try:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	316 cmdargs = fancyopts.fancyopts(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	317 req.args[:], commands.globalopts, {}
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	318 )
39283 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	319 cmd = cmdargs[0]
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	320 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	321 realcmd = aliases[0]
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	322 except (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	323 error.UnknownCommand,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	324 error.AmbiguousCommand,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	325 IndexError,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	326 getopt.GetoptError,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	327 ):
39283 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	328 # 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	329 # 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	330 # 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	331 # 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	332 pass
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	333 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	334 # 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	335 # 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	336 # 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	337 # 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	338 # 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	339 # 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	340 # --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	341 # name. This used to actually run the debugger.
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	342 if (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	343 len(req.args) != 4
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	344 or req.args[0] != '-R'
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	345 or req.args[1].startswith('--')
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	346 or req.args[2] != 'serve'
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	347 or req.args[3] != '--stdio'
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	348 ):
39283 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	349 raise error.Abort(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	350 _('potentially unsafe serve --stdio invocation: %s')
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	351 % (stringutil.pprint(req.args),)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	352 )
19639 09573ad59f7b dispatch: move command line --config argument parsing to _runcatch() Sean Farley <sean.michael.farley@gmail.com> parents: 19229 diff changeset	353
39283 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	354 try:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	355 debugger = 'pdb'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	356 debugtrace = {'pdb': pdb.set_trace}
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	357 debugmortem = {'pdb': pdb.post_mortem}
19639 09573ad59f7b dispatch: move command line --config argument parsing to _runcatch() Sean Farley <sean.michael.farley@gmail.com> parents: 19229 diff changeset	358
39283 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	359 # 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	360 # (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	361 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	362
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	363 if req.repo:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	364 # 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	365 # the repo ui
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	366 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	367 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	368
39283 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	369 # developer config: ui.debugger
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	370 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	371 debugmod = pdb
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	372 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	373 # 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	374 debugger = 'pdb'
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	375 elif req.earlyoptions['debugger']:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	376 # 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	377 # 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	378 # debugging has been requested
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	379 with demandimport.deactivated():
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	380 try:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	381 debugmod = __import__(debugger)
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	382 except ImportError:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	383 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	384
39283 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	385 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	386 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	387
39283 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	388 # 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	389 if req.earlyoptions['debugger']:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	390 ui.warn(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	391 _(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	392 "entering debugger - "
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	393 "type c to continue starting hg or h for help\n"
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	394 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	395 )
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	396
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	397 if (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	398 debugger != 'pdb'
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	399 and debugtrace[debugger] == debugtrace['pdb']
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	400 ):
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	401 ui.warn(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	402 _(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	403 "%s debugger specified "
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	404 "but its module was not found\n"
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	405 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	406 % debugger
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	407 )
39283 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	408 with demandimport.deactivated():
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	409 debugtrace[debugger]()
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	410 try:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	411 return _dispatch(req)
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	412 finally:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	413 ui.flush()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	414 except: # re-raises
39283 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	415 # 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	416 if req.earlyoptions['debugger']:
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	417 traceback.print_exc()
4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	418 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	419 raise
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	420
39283 4019b4542e61 dispatch: have dispatch.dispatch and dispatch._runcatch emit trace events Augie Fackler <augie@google.com> parents: 38828 diff changeset	421 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	422
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	423
32040 0fb78cb90ca7 dispatch: mark callcatch() as a private function Yuya Nishihara <yuya@tcha.org> parents: 31960 diff changeset	424 def _callcatch(ui, func):
30529 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30528 diff changeset	425 """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	426 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	427 uncaught exceptions.
29773 39149b6036e6 dispatch: split global error handling out so it can be reused Jun Wu <quark@fb.com> parents: 29132 diff changeset	428 """
39149b6036e6 dispatch: split global error handling out so it can be reused Jun Wu <quark@fb.com> parents: 29132 diff changeset	429 try:
30529 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30528 diff changeset	430 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	431 except error.AmbiguousCommand as inst:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	432 ui.warn(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	433 _("hg: command '%s' is ambiguous:\n %s\n")
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	434 % (inst.args[0], " ".join(inst.args[1]))
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	435 )
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25329 diff changeset	436 except error.CommandError as inst:
7645 020a896a5292 dispatch: sort exception handlers Matt Mackall <mpm@selenic.com> parents: 7644 diff changeset	437 if inst.args[0]:
31276 8089de5fab89 dispatch: add pagination of two more help cases Augie Fackler <augie@google.com> parents: 31209 diff changeset	438 ui.pager('help')
32643 3ce53a499334 dispatch: convert exception payload to bytes more carefully Augie Fackler <raf@durin42.com> parents: 32599 diff changeset	439 msgbytes = pycompat.bytestr(inst.args[1])
3ce53a499334 dispatch: convert exception payload to bytes more carefully Augie Fackler <raf@durin42.com> parents: 32599 diff changeset	440 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	441 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	442 else:
020a896a5292 dispatch: sort exception handlers Matt Mackall <mpm@selenic.com> parents: 7644 diff changeset	443 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	444 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	445 except error.ParseError as inst:
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30528 diff changeset	446 _formatparse(ui.warn, inst)
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30528 diff changeset	447 return -1
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25329 diff changeset	448 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	449 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	450 try:
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10282 diff changeset	451 # 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	452 # (but don't check for extensions themselves)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	453 formatted = help.formattedhelp(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	454 ui, commands, inst.args[0], unknowncmd=True
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	455 )
31080 ab20491b1760 dispatch: rearrange 'unknown command' code to better employ pager Augie Fackler <augie@google.com> parents: 31047 diff changeset	456 ui.warn(nocmdmsg)
ab20491b1760 dispatch: rearrange 'unknown command' code to better employ pager Augie Fackler <augie@google.com> parents: 31047 diff changeset	457 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	458 except (error.UnknownCommand, error.Abort):
24222 02d7b5cd373b dispatch: offer suggestions of similar-named commands Augie Fackler <augie@google.com> parents: 24221 diff changeset	459 suggested = False
02d7b5cd373b dispatch: offer suggestions of similar-named commands Augie Fackler <augie@google.com> parents: 24221 diff changeset	460 if len(inst.args) == 2:
02d7b5cd373b dispatch: offer suggestions of similar-named commands Augie Fackler <augie@google.com> parents: 24221 diff changeset	461 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	462 if sim:
31080 ab20491b1760 dispatch: rearrange 'unknown command' code to better employ pager Augie Fackler <augie@google.com> parents: 31047 diff changeset	463 ui.warn(nocmdmsg)
27623 b3376fba4ab9 dispatch: report similar names consistently Bryan O'Sullivan <bos@serpentine.com> parents: 27615 diff changeset	464 _reportsimilar(ui.warn, sim)
24222 02d7b5cd373b dispatch: offer suggestions of similar-named commands Augie Fackler <augie@google.com> parents: 24221 diff changeset	465 suggested = True
02d7b5cd373b dispatch: offer suggestions of similar-named commands Augie Fackler <augie@google.com> parents: 24221 diff changeset	466 if not suggested:
31080 ab20491b1760 dispatch: rearrange 'unknown command' code to better employ pager Augie Fackler <augie@google.com> parents: 31047 diff changeset	467 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	468 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	469 except IOError:
4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30528 diff changeset	470 raise
7645 020a896a5292 dispatch: sort exception handlers Matt Mackall <mpm@selenic.com> parents: 7644 diff changeset	471 except KeyboardInterrupt:
28520 84cc72c5771e dispatch: catch KeyboardInterrupt more broadly Yuya Nishihara <yuya@tcha.org> parents: 28515 diff changeset	472 raise
30529 4338f87dbf6f dispatch: move part of callcatch to scmutil Jun Wu <quark@fb.com> parents: 30528 diff changeset	473 except: # probably re-raises
28784 09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	474 if not handlecommandexception(ui):
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	475 raise
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	476
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	477 return -1
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	478
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	479
14265 e4ab5ae193f2 add positional arguments to non-shell aliases Alexander Solovyov <alexander@solovyov.net> parents: 14096 diff changeset	480 def aliasargs(fn, givenargs):
34104 5361771f9714 wrapfunction: use functools.partial if possible Jun Wu <quark@fb.com> parents: 34040 diff changeset	481 args = []
5361771f9714 wrapfunction: use functools.partial if possible Jun Wu <quark@fb.com> parents: 34040 diff changeset	482 # 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	483 if not util.safehasattr(fn, '_origfunc'):
5361771f9714 wrapfunction: use functools.partial if possible Jun Wu <quark@fb.com> parents: 34040 diff changeset	484 args = getattr(fn, 'args', args)
16294 795d591b6ef5 alias: abort on missing positional args (issue3331) Matt Mackall <mpm@selenic.com> parents: 16277 diff changeset	485 if args:
37123 a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37122 diff changeset	486 cmd = ' '.join(map(procutil.shellquote, args))
14265 e4ab5ae193f2 add positional arguments to non-shell aliases Alexander Solovyov <alexander@solovyov.net> parents: 14096 diff changeset	487
e4ab5ae193f2 add positional arguments to non-shell aliases Alexander Solovyov <alexander@solovyov.net> parents: 14096 diff changeset	488 nums = []
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	489
14265 e4ab5ae193f2 add positional arguments to non-shell aliases Alexander Solovyov <alexander@solovyov.net> parents: 14096 diff changeset	490 def replacer(m):
e4ab5ae193f2 add positional arguments to non-shell aliases Alexander Solovyov <alexander@solovyov.net> parents: 14096 diff changeset	491 num = int(m.group(1)) - 1
e4ab5ae193f2 add positional arguments to non-shell aliases Alexander Solovyov <alexander@solovyov.net> parents: 14096 diff changeset	492 nums.append(num)
16277 1c2aaf05f7d7 aliases: use empty string for missing position parameters (issue3331) Matt Mackall <mpm@selenic.com> parents: 15781 diff changeset	493 if num < len(givenargs):
1c2aaf05f7d7 aliases: use empty string for missing position parameters (issue3331) Matt Mackall <mpm@selenic.com> parents: 15781 diff changeset	494 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	495 raise error.Abort(_('too few arguments for command alias'))
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	496
31498 492c64afc54c py3: make the regular expression bytes to prevent TypeError Pulkit Goyal <7895pulkit@gmail.com> parents: 31314 diff changeset	497 cmd = re.sub(br'\$(\d+\|\$)', replacer, cmd)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	498 givenargs = [x for i, x in enumerate(givenargs) if i not in nums]
30681 caf7e1c5efe4 py3: have a bytes version of shlex.split() Pulkit Goyal <7895pulkit@gmail.com> parents: 30657 diff changeset	499 args = pycompat.shlexsplit(cmd)
14265 e4ab5ae193f2 add positional arguments to non-shell aliases Alexander Solovyov <alexander@solovyov.net> parents: 14096 diff changeset	500 return args + givenargs
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	501
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	502
22158 bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	503 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	504 '''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	505
bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	506 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	507 '''
bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	508 # 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	509 # 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	510 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	511 replacemap['$0'] = name
bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	512 replacemap['$$'] = '$'
bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	513 replacemap['$@'] = ' '.join(args)
bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	514 # 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	515 # 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	516 # 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	517 # 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	518 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	519 # escape '\$' for regex
35166 25c543944bc0 py3: add b'' to regular expressions which are raw strings Pulkit Goyal <7895pulkit@gmail.com> parents: 34781 diff changeset	520 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	521 r = re.compile(regex)
bc2132dfc0a4 alias: expand "$@" as list of parameters quoted individually (BC) (issue4200) Siddharth Agarwal <sid0@fb.com> parents: 21961 diff changeset	522 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	523
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	524
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	525 class cmdalias(object):
37137 6890b7e991a4 help: supporting both help and doc for aliases Rodrigo Damazio <rdamazio@google.com> parents: 37123 diff changeset	526 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	527 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	528 self.cmdname = ''
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	529 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	530 self.fn = None
29087 ad1bdea43965 dispatch: defer environment variable resolution in alias commands (BC) Jun Wu <quark@fb.com> parents: 28861 diff changeset	531 self.givenargs = []
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	532 self.opts = []
21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	533 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	534 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	535 self.unknowncmd = False
28828 3640c1702c43 help: report source of aliases timeless <timeless@mozdev.org> parents: 28821 diff changeset	536 self.source = source
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	537
21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	538 try:
12039 18e1e7520b67 alias: make shadowing behavior more consistent (issue2054) Brodie Rao <brodie@bitheap.org> parents: 11712 diff changeset	539 aliases, entry = cmdutil.findcmd(self.name, cmdtable)
18e1e7520b67 alias: make shadowing behavior more consistent (issue2054) Brodie Rao <brodie@bitheap.org> parents: 11712 diff changeset	540 for alias, e in cmdtable.iteritems():
18e1e7520b67 alias: make shadowing behavior more consistent (issue2054) Brodie Rao <brodie@bitheap.org> parents: 11712 diff changeset	541 if e is entry:
18e1e7520b67 alias: make shadowing behavior more consistent (issue2054) Brodie Rao <brodie@bitheap.org> parents: 11712 diff changeset	542 self.cmd = alias
18e1e7520b67 alias: make shadowing behavior more consistent (issue2054) Brodie Rao <brodie@bitheap.org> parents: 11712 diff changeset	543 break
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	544 self.shadows = True
21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	545 except error.UnknownCommand:
21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	546 self.shadows = False
21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	547
21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	548 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	549 self.badalias = _("no definition for alias '%s'") % self.name
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	550 return
21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	551
11524 24965bb270b7 dispatch: add shell aliases Steve Losh <steve@stevelosh.com> parents: 11495 diff changeset	552 if self.definition.startswith('!'):
37137 6890b7e991a4 help: supporting both help and doc for aliases Rodrigo Damazio <rdamazio@google.com> parents: 37123 diff changeset	553 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	554 self.shell = True
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	555
11524 24965bb270b7 dispatch: add shell aliases Steve Losh <steve@stevelosh.com> parents: 11495 diff changeset	556 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	557 env = {'HG_ARGS': ' '.join((self.name,) + args)}
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	558
11989 f853873fc66d aliases: provide more flexible ways to work with shell alias arguments Steve Losh <steve@stevelosh.com> parents: 11985 diff changeset	559 def _checkvar(m):
13392 777cef34a890 dispatch: support for $ escaping in shell-alias definition Roman Sokolov <sokolov.r.v@gmail.com> parents: 13382 diff changeset	560 if m.groups()[0] == '$':
777cef34a890 dispatch: support for $ escaping in shell-alias definition Roman Sokolov <sokolov.r.v@gmail.com> parents: 13382 diff changeset	561 return m.group()
777cef34a890 dispatch: support for $ escaping in shell-alias definition Roman Sokolov <sokolov.r.v@gmail.com> parents: 13382 diff changeset	562 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	563 return m.group()
f853873fc66d aliases: provide more flexible ways to work with shell alias arguments Steve Losh <steve@stevelosh.com> parents: 11985 diff changeset	564 else:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	565 ui.debug(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	566 "No argument found for substitution "
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	567 "of %i variable in alias '%s' definition.\n"
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	568 % (int(m.groups()[0]), self.name)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	569 )
11989 f853873fc66d aliases: provide more flexible ways to work with shell alias arguments Steve Losh <steve@stevelosh.com> parents: 11985 diff changeset	570 return ''
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	571
37137 6890b7e991a4 help: supporting both help and doc for aliases Rodrigo Damazio <rdamazio@google.com> parents: 37123 diff changeset	572 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	573 cmd = aliasinterpolate(self.name, args, cmd)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	574 return ui.system(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	575 cmd, environ=env, blockedtag='alias_%s' % self.name
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	576 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	577
11524 24965bb270b7 dispatch: add shell aliases Steve Losh <steve@stevelosh.com> parents: 11495 diff changeset	578 self.fn = fn
40490 444861dc1e55 help: displaying documented aliases by default rdamazio@google.com parents: 40402 diff changeset	579 self.alias = True
37137 6890b7e991a4 help: supporting both help and doc for aliases Rodrigo Damazio <rdamazio@google.com> parents: 37123 diff changeset	580 self._populatehelp(ui, name, shdef, self.fn)
11524 24965bb270b7 dispatch: add shell aliases Steve Losh <steve@stevelosh.com> parents: 11495 diff changeset	581 return
24965bb270b7 dispatch: add shell aliases Steve Losh <steve@stevelosh.com> parents: 11495 diff changeset	582
21569 c5afb07c33d3 alias: handle shlex error in command aliases Yuya Nishihara <yuya@tcha.org> parents: 21556 diff changeset	583 try:
30681 caf7e1c5efe4 py3: have a bytes version of shlex.split() Pulkit Goyal <7895pulkit@gmail.com> parents: 30657 diff changeset	584 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	585 except ValueError as inst:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	586 self.badalias = _("error in definition for alias '%s': %s") % (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	587 self.name,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	588 stringutil.forcebytestr(inst),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	589 )
21569 c5afb07c33d3 alias: handle shlex error in command aliases Yuya Nishihara <yuya@tcha.org> parents: 21556 diff changeset	590 return
35234 7ce0ba3a1c32 dispatch: replace _earlygetopt(strip=True) with new parser Yuya Nishihara <yuya@tcha.org> parents: 35233 diff changeset	591 earlyopts, args = _earlysplitopts(args)
7ce0ba3a1c32 dispatch: replace _earlygetopt(strip=True) with new parser Yuya Nishihara <yuya@tcha.org> parents: 35233 diff changeset	592 if earlyopts:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	593 self.badalias = _(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	594 "error in definition for alias '%s': %s may "
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	595 "only be given on the command line"
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	596 ) % (self.name, '/'.join(pycompat.ziplist(*earlyopts)[0]))
35234 7ce0ba3a1c32 dispatch: replace _earlygetopt(strip=True) with new parser Yuya Nishihara <yuya@tcha.org> parents: 35233 diff changeset	597 return
12092 4982fa38e544 alias: print what command is being shadowed in debug message Brodie Rao <brodie@bitheap.org> parents: 12070 diff changeset	598 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	599 self.givenargs = args
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	600
21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	601 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	602 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	603 if len(tableentry) > 2:
37137 6890b7e991a4 help: supporting both help and doc for aliases Rodrigo Damazio <rdamazio@google.com> parents: 37123 diff changeset	604 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	605 else:
8bce1e0d2801 alias: do not crash when aliased command has no usage help text Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9825 diff changeset	606 self.fn, self.opts = tableentry
37137 6890b7e991a4 help: supporting both help and doc for aliases Rodrigo Damazio <rdamazio@google.com> parents: 37123 diff changeset	607 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	608
40490 444861dc1e55 help: displaying documented aliases by default rdamazio@google.com parents: 40402 diff changeset	609 self.alias = True
37137 6890b7e991a4 help: supporting both help and doc for aliases Rodrigo Damazio <rdamazio@google.com> parents: 37123 diff changeset	610 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	611
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	612 except error.UnknownCommand:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	613 self.badalias = _("alias '%s' resolves to unknown command '%s'") % (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	614 self.name,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	615 cmd,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	616 )
22161 063628423fd1 alias: provide "unknowncmd" flag to tell help to look for disabled command Yuya Nishihara <yuya@tcha.org> parents: 22160 diff changeset	617 self.unknowncmd = True
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	618 except error.AmbiguousCommand:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	619 self.badalias = _(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	620 "alias '%s' resolves to ambiguous command '%s'"
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	621 ) % (self.name, cmd)
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	622
37137 6890b7e991a4 help: supporting both help and doc for aliases Rodrigo Damazio <rdamazio@google.com> parents: 37123 diff changeset	623 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	624 # 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	625 cfg = {}
40490 444861dc1e55 help: displaying documented aliases by default rdamazio@google.com parents: 40402 diff changeset	626 for k in ('doc', 'help', 'category'):
37142 aa55c5354b8f alias: reject non-ascii characters in user help/doc strings Yuya Nishihara <yuya@tcha.org> parents: 37137 diff changeset	627 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	628 if v is None:
aa55c5354b8f alias: reject non-ascii characters in user help/doc strings Yuya Nishihara <yuya@tcha.org> parents: 37137 diff changeset	629 continue
aa55c5354b8f alias: reject non-ascii characters in user help/doc strings Yuya Nishihara <yuya@tcha.org> parents: 37137 diff changeset	630 if not encoding.isasciistr(v):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	631 self.badalias = _(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	632 "non-ASCII character in alias definition " "'%s:%s'"
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	633 ) % (name, k)
37142 aa55c5354b8f alias: reject non-ascii characters in user help/doc strings Yuya Nishihara <yuya@tcha.org> parents: 37137 diff changeset	634 return
aa55c5354b8f alias: reject non-ascii characters in user help/doc strings Yuya Nishihara <yuya@tcha.org> parents: 37137 diff changeset	635 cfg[k] = v
aa55c5354b8f alias: reject non-ascii characters in user help/doc strings Yuya Nishihara <yuya@tcha.org> parents: 37137 diff changeset	636
aa55c5354b8f alias: reject non-ascii characters in user help/doc strings Yuya Nishihara <yuya@tcha.org> parents: 37137 diff changeset	637 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	638 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	639 # drop prefix in old-style help lines so hg shows the alias
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	640 self.help = self.help[4 + len(cmd) :]
37137 6890b7e991a4 help: supporting both help and doc for aliases Rodrigo Damazio <rdamazio@google.com> parents: 37123 diff changeset	641
40490 444861dc1e55 help: displaying documented aliases by default rdamazio@google.com parents: 40402 diff changeset	642 self.owndoc = 'doc' in cfg
37143 1d56c539794e py3: bytes/unicode dance on __doc__ of cmdalias Yuya Nishihara <yuya@tcha.org> parents: 37142 diff changeset	643 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	644 if doc is not None:
1d56c539794e py3: bytes/unicode dance on __doc__ of cmdalias Yuya Nishihara <yuya@tcha.org> parents: 37142 diff changeset	645 doc = pycompat.sysstr(doc)
1d56c539794e py3: bytes/unicode dance on __doc__ of cmdalias Yuya Nishihara <yuya@tcha.org> parents: 37142 diff changeset	646 self.__doc__ = doc
37137 6890b7e991a4 help: supporting both help and doc for aliases Rodrigo Damazio <rdamazio@google.com> parents: 37123 diff changeset	647
40490 444861dc1e55 help: displaying documented aliases by default rdamazio@google.com parents: 40402 diff changeset	648 self.helpcategory = cfg.get('category', registrar.command.CATEGORY_NONE)
444861dc1e55 help: displaying documented aliases by default rdamazio@google.com parents: 40402 diff changeset	649
29087 ad1bdea43965 dispatch: defer environment variable resolution in alias commands (BC) Jun Wu <quark@fb.com> parents: 28861 diff changeset	650 @property
ad1bdea43965 dispatch: defer environment variable resolution in alias commands (BC) Jun Wu <quark@fb.com> parents: 28861 diff changeset	651 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	652 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	653 return aliasargs(self.fn, args)
ad1bdea43965 dispatch: defer environment variable resolution in alias commands (BC) Jun Wu <quark@fb.com> parents: 28861 diff changeset	654
28621 d856e85a8a7a dispatch: make cmdalias forward command attributes to function Yuya Nishihara <yuya@tcha.org> parents: 28538 diff changeset	655 def __getattr__(self, name):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	656 adefaults = {
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	657 r'norepo': True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	658 r'intents': set(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	659 r'optionalrepo': False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	660 r'inferrepo': False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	661 }
28621 d856e85a8a7a dispatch: make cmdalias forward command attributes to function Yuya Nishihara <yuya@tcha.org> parents: 28538 diff changeset	662 if name not in adefaults:
d856e85a8a7a dispatch: make cmdalias forward command attributes to function Yuya Nishihara <yuya@tcha.org> parents: 28538 diff changeset	663 raise AttributeError(name)
d856e85a8a7a dispatch: make cmdalias forward command attributes to function Yuya Nishihara <yuya@tcha.org> parents: 28538 diff changeset	664 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	665 return adefaults[name]
d856e85a8a7a dispatch: make cmdalias forward command attributes to function Yuya Nishihara <yuya@tcha.org> parents: 28538 diff changeset	666 return getattr(self.fn, name)
d856e85a8a7a dispatch: make cmdalias forward command attributes to function Yuya Nishihara <yuya@tcha.org> parents: 28538 diff changeset	667
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	668 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	669 if self.badalias:
22164 efd65e51bc0b alias: exit from bad definition by Abort Yuya Nishihara <yuya@tcha.org> parents: 22163 diff changeset	670 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	671 if self.unknowncmd:
10364 de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10282 diff changeset	672 try:
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10282 diff changeset	673 # 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	674 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	675 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	676 except error.UnknownCommand:
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10282 diff changeset	677 pass
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26421 diff changeset	678 raise error.Abort(self.badalias, hint=hint)
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	679 if self.shadows:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	680 ui.debug(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	681 "alias '%s' shadows command '%s'\n" % (self.name, self.cmdname)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	682 )
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	683
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	684 ui.log(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	685 'commandalias',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	686 "alias '%s' expands to '%s'\n",
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	687 self.name,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	688 self.definition,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	689 )
14950 144e97421f6b dispatch: use safehasattr instead of hasattr Augie Fackler <durin42@gmail.com> parents: 14918 diff changeset	690 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	691 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	692 else:
12093 cd895084a4cd alias: on --debug, print expansion when it has invalid arguments Brodie Rao <brodie@bitheap.org> parents: 12092 diff changeset	693 try:
21556 5e13507a3b4e alias: fix loss of non-zero return code in command aliases Yuya Nishihara <yuya@tcha.org> parents: 20829 diff changeset	694 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	695 except error.SignatureError:
cd895084a4cd alias: on --debug, print expansion when it has invalid arguments Brodie Rao <brodie@bitheap.org> parents: 12092 diff changeset	696 args = ' '.join([self.cmdname] + self.args)
14704 b24d596fcd25 Backed out changeset 1ec8bd909ac3 Martin Geisler <mg@aragost.com> parents: 14702 diff changeset	697 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	698 raise
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	699
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	700
34313 bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	701 class lazyaliasentry(object):
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	702 """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	703
37137 6890b7e991a4 help: supporting both help and doc for aliases Rodrigo Damazio <rdamazio@google.com> parents: 37123 diff changeset	704 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	705 self.ui = ui
34313 bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	706 self.name = name
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	707 self.definition = definition
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	708 self.cmdtable = cmdtable.copy()
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	709 self.source = source
40490 444861dc1e55 help: displaying documented aliases by default rdamazio@google.com parents: 40402 diff changeset	710 self.alias = True
34313 bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	711
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	712 @util.propertycache
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	713 def _aliasdef(self):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	714 return cmdalias(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	715 self.ui, self.name, self.definition, self.cmdtable, self.source
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	716 )
34313 bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	717
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	718 def __getitem__(self, n):
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	719 aliasdef = self._aliasdef
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	720 if n == 0:
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	721 return aliasdef
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	722 elif n == 1:
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	723 return aliasdef.opts
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	724 elif n == 2:
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	725 return aliasdef.help
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	726 else:
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	727 raise IndexError
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	728
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	729 def __iter__(self):
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	730 for i in range(3):
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	731 yield self[i]
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	732
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	733 def __len__(self):
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	734 return 3
bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	735
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	736
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	737 def addaliases(ui, cmdtable):
21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	738 # aliases are processed after extensions have been loaded, so they
21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	739 # 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	740 # 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	741 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	742 try:
34313 bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	743 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	744 continue
f4b7be3f8430 dispatch: don't rewrap aliases that have the same definition Idan Kamara <idankk86@gmail.com> parents: 14992 diff changeset	745 except (KeyError, AttributeError):
f4b7be3f8430 dispatch: don't rewrap aliases that have the same definition Idan Kamara <idankk86@gmail.com> parents: 14992 diff changeset	746 # 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	747 pass
f4b7be3f8430 dispatch: don't rewrap aliases that have the same definition Idan Kamara <idankk86@gmail.com> parents: 14992 diff changeset	748
34312 0e48813cc106 alias: test duplicated definition earlier Jun Wu <quark@fb.com> parents: 34146 diff changeset	749 source = ui.configsource('alias', alias)
37137 6890b7e991a4 help: supporting both help and doc for aliases Rodrigo Damazio <rdamazio@google.com> parents: 37123 diff changeset	750 entry = lazyaliasentry(ui, alias, definition, cmdtable, source)
34313 bd50aa1aa035 alias: make alias command lazily resolved Jun Wu <quark@fb.com> parents: 34312 diff changeset	751 cmdtable[alias] = entry
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	752
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	753
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	754 def _parse(ui, args):
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	755 options = {}
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	756 cmdoptions = {}
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	757
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	758 try:
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	759 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	760 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	761 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	762
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	763 if args:
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	764 cmd, args = args[0], args[1:]
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	765 aliases, entry = cmdutil.findcmd(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	766 cmd, commands.table, ui.configbool("ui", "strict")
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	767 )
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	768 cmd = aliases[0]
14265 e4ab5ae193f2 add positional arguments to non-shell aliases Alexander Solovyov <alexander@solovyov.net> parents: 14096 diff changeset	769 args = aliasargs(entry[0], args)
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	770 defaults = ui.config("defaults", cmd)
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	771 if defaults:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	772 args = (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	773 pycompat.maplist(util.expandpath, pycompat.shlexsplit(defaults))
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	774 + args
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	775 )
9875 d6a95c5f6ff9 dispatch: minor refactoring Henri Wiechers <hwiechers@gmail.com> parents: 9825 diff changeset	776 c = list(entry[1])
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	777 else:
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	778 cmd = None
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	779 c = []
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	780
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	781 # combine global options into local
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	782 for o in commands.globalopts:
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	783 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	784
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	785 try:
29833 61a4cdc98307 dispatch: explicitly pass fancyopts optional arg as a keyword Augie Fackler <augie@google.com> parents: 29795 diff changeset	786 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	787 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	788 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	789
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	790 # separate global options back out
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	791 for o in commands.globalopts:
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	792 n = o[1]
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	793 options[n] = cmdoptions[n]
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	794 del cmdoptions[n]
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	795
9875 d6a95c5f6ff9 dispatch: minor refactoring Henri Wiechers <hwiechers@gmail.com> parents: 9825 diff changeset	796 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	797
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	798
8137 7fd0616b3d80 ui: kill updateopts Matt Mackall <mpm@selenic.com> parents: 8136 diff changeset	799 def _parseconfig(ui, config):
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	800 """parse the --config options from the command line"""
14753 10dcb3e7cb55 dispatch: return read config options Idan Kamara <idankk86@gmail.com> parents: 14752 diff changeset	801 configs = []
10dcb3e7cb55 dispatch: return read config options Idan Kamara <idankk86@gmail.com> parents: 14752 diff changeset	802
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	803 for cfg in config:
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	804 try:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	805 name, value = [cfgelem.strip() for cfgelem in cfg.split('=', 1)]
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	806 section, name = name.split('.', 1)
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	807 if not section or not name:
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	808 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	809 ui.setconfig(section, name, value, '--config')
14753 10dcb3e7cb55 dispatch: return read config options Idan Kamara <idankk86@gmail.com> parents: 14752 diff changeset	810 configs.append((section, name, value))
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	811 except (IndexError, ValueError):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	812 raise error.Abort(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	813 _(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	814 'malformed --config option: %r '
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	815 '(use --config section.name=value)'
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	816 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	817 % pycompat.bytestr(cfg)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	818 )
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	819
14753 10dcb3e7cb55 dispatch: return read config options Idan Kamara <idankk86@gmail.com> parents: 14752 diff changeset	820 return configs
10dcb3e7cb55 dispatch: return read config options Idan Kamara <idankk86@gmail.com> parents: 14752 diff changeset	821
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	822
35233 6e6d0a5b88e6 dispatch: replace _earlyreq() with new fancyopts-based parser Yuya Nishihara <yuya@tcha.org>* parents: 35232 diff changeset	823 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	824 options = {}
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	825 fancyopts.fancyopts(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	826 args,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	827 commands.globalopts,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	828 options,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	829 gnu=not ui.plain('strictflags'),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	830 early=True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	831 optaliases={'repository': ['repo']},
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	832 )
34996 c9740b69b9b7 dispatch: add HGPLAIN=+strictflags to restrict early parsing of global options Yuya Nishihara <yuya@tcha.org> parents: 34986 diff changeset	833 return options
c9740b69b9b7 dispatch: add HGPLAIN=+strictflags to restrict early parsing of global options Yuya Nishihara <yuya@tcha.org> parents: 34986 diff changeset	834
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	835
35234 7ce0ba3a1c32 dispatch: replace _earlygetopt(strip=True) with new parser Yuya Nishihara <yuya@tcha.org> parents: 35233 diff changeset	836 def _earlysplitopts(args):
7ce0ba3a1c32 dispatch: replace _earlygetopt(strip=True) with new parser Yuya Nishihara <yuya@tcha.org> parents: 35233 diff changeset	837 """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	838 shortoptions = 'R:'
7ce0ba3a1c32 dispatch: replace _earlygetopt(strip=True) with new parser Yuya Nishihara <yuya@tcha.org> parents: 35233 diff changeset	839 # TODO: perhaps 'debugger' should be included
7ce0ba3a1c32 dispatch: replace _earlygetopt(strip=True) with new parser Yuya Nishihara <yuya@tcha.org> parents: 35233 diff changeset	840 longoptions = ['cwd=', 'repository=', 'repo=', 'config=']
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	841 return fancyopts.earlygetopt(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	842 args, shortoptions, longoptions, gnu=True, keepsep=True
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	843 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	844
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	845
11330 713ae78bb583 provide pre- and post- hooks with parsed command line arguments. Chad Dombrova <chadrik@gmail.com> parents: 11305 diff changeset	846 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	847 # run pre-hook, and abort if it fails
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	848 hook.hook(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	849 lui,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	850 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	851 "pre-%s" % cmd,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	852 True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	853 args=" ".join(fullargs),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	854 pats=cmdpats,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	855 opts=cmdoptions,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	856 )
29129 e6dfb0e4eeef dispatch: add fail-* family of hooks Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 29114 diff changeset	857 try:
e6dfb0e4eeef dispatch: add fail-* family of hooks Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 29114 diff changeset	858 ret = _runcommand(ui, options, cmd, d)
e6dfb0e4eeef dispatch: add fail-* family of hooks Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 29114 diff changeset	859 # run post-hook, passing command result
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	860 hook.hook(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	861 lui,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	862 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	863 "post-%s" % cmd,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	864 False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	865 args=" ".join(fullargs),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	866 result=ret,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	867 pats=cmdpats,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	868 opts=cmdoptions,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	869 )
29129 e6dfb0e4eeef dispatch: add fail-* family of hooks Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 29114 diff changeset	870 except Exception:
e6dfb0e4eeef dispatch: add fail-* family of hooks Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 29114 diff changeset	871 # run failure hook and re-raise
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	872 hook.hook(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	873 lui,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	874 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	875 "fail-%s" % cmd,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	876 False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	877 args=" ".join(fullargs),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	878 pats=cmdpats,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	879 opts=cmdoptions,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	880 )
29129 e6dfb0e4eeef dispatch: add fail-* family of hooks Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 29114 diff changeset	881 raise
7819 14b703252f14 dispatch: extract command execution block into method Bill Barry <after.fallout@gmail.com> parents: 7772 diff changeset	882 return ret
14b703252f14 dispatch: extract command execution block into method Bill Barry <after.fallout@gmail.com> parents: 7772 diff changeset	883
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	884
28263 59509c6724c7 dispatch: add wd parameter to _getlocal Jun Wu <quark@fb.com> parents: 28081 diff changeset	885 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	886 """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	887
12536 208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	888 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	889 """
28263 59509c6724c7 dispatch: add wd parameter to _getlocal Jun Wu <quark@fb.com> parents: 28081 diff changeset	890 if wd is None:
59509c6724c7 dispatch: add wd parameter to _getlocal Jun Wu <quark@fb.com> parents: 28081 diff changeset	891 try:
39823 24e493ec2229 py3: rename pycompat.getcwd() to encoding.getcwd() (API) Matt Harbison <matt_harbison@yahoo.com> parents: 39529 diff changeset	892 wd = encoding.getcwd()
28263 59509c6724c7 dispatch: add wd parameter to _getlocal Jun Wu <quark@fb.com> parents: 28081 diff changeset	893 except OSError as e:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	894 raise error.Abort(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	895 _("error getting current working directory: %s")
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	896 % encoding.strtolocal(e.strerror)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	897 )
11675 f92f8921a5cc dispatch: give better error message when cwd doesn't exist (issue2293) Mads Kiilerich <mads@kiilerich.com> parents: 11600 diff changeset	898 path = cmdutil.findrepo(wd) or ""
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	899 if not path:
18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	900 lui = ui
9436 96379c93ba6f improve code readability Andrey Somov <py4fun@gmail.com> parents: 9411 diff changeset	901 else:
12636 c24215aa7e69 dispatch: remove superfluous try/except when reading local ui config Brodie Rao <brodie@bitheap.org> parents: 12633 diff changeset	902 lui = ui.copy()
12637 42ca7aef28d3 dispatch: properly handle relative path aliases used with -R (issue2376) Brodie Rao <brodie@bitheap.org> parents: 12636 diff changeset	903 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	904
34985 d3d35a55e03b dispatch: convert non-list option parsed by _earlygetopt() to string Yuya Nishihara <yuya@tcha.org> parents: 34984 diff changeset	905 if rpath:
d3d35a55e03b dispatch: convert non-list option parsed by _earlygetopt() to string Yuya Nishihara <yuya@tcha.org> parents: 34984 diff changeset	906 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	907 lui = ui.copy()
12637 42ca7aef28d3 dispatch: properly handle relative path aliases used with -R (issue2376) Brodie Rao <brodie@bitheap.org> parents: 12636 diff changeset	908 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	909
12536 208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	910 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	911
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	912
29132 12769703d4ba dispatch: always load extensions before running shell aliases (issue5230) Jun Wu <quark@fb.com> parents: 29129 diff changeset	913 def _checkshellalias(lui, ui, args):
12769703d4ba dispatch: always load extensions before running shell aliases (issue5230) Jun Wu <quark@fb.com> parents: 29129 diff changeset	914 """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	915 options = {}
12748 d10369fefd01 alias: fail gracefully when invalid global options are given (issue2442) Steve Losh <steve@stevelosh.com> parents: 12637 diff changeset	916
d10369fefd01 alias: fail gracefully when invalid global options are given (issue2442) Steve Losh <steve@stevelosh.com> parents: 12637 diff changeset	917 try:
d10369fefd01 alias: fail gracefully when invalid global options are given (issue2442) Steve Losh <steve@stevelosh.com> parents: 12637 diff changeset	918 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	919 except getopt.GetoptError:
12748 d10369fefd01 alias: fail gracefully when invalid global options are given (issue2442) Steve Losh <steve@stevelosh.com> parents: 12637 diff changeset	920 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	921
208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	922 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	923 return
208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	924
29132 12769703d4ba dispatch: always load extensions before running shell aliases (issue5230) Jun Wu <quark@fb.com> parents: 29129 diff changeset	925 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	926
208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	927 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	928 try:
29132 12769703d4ba dispatch: always load extensions before running shell aliases (issue5230) Jun Wu <quark@fb.com> parents: 29129 diff changeset	929 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	930 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	931 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	932 return
208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	933
208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	934 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	935 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	936
14950 144e97421f6b dispatch: use safehasattr instead of hasattr Augie Fackler <durin42@gmail.com> parents: 14918 diff changeset	937 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	938 # 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	939 _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	940 d = lambda: fn(ui, *args[1:])
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	941 return lambda: runcommand(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	942 lui, None, cmd, args[:1], ui, options, d, [], {}
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	943 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	944
12536 208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	945
14439 80c599eee3f3 dispatch: use the request to store the ui object Idan Kamara <idankk86@gmail.com> parents: 14438 diff changeset	946 def _dispatch(req):
14438 08bfec2ef031 dispatch: wrap dispatch related information in a request class Idan Kamara <idankk86@gmail.com> parents: 14286 diff changeset	947 args = req.args
14439 80c599eee3f3 dispatch: use the request to store the ui object Idan Kamara <idankk86@gmail.com> parents: 14438 diff changeset	948 ui = req.ui
80c599eee3f3 dispatch: use the request to store the ui object Idan Kamara <idankk86@gmail.com> parents: 14438 diff changeset	949
12536 208fc9ad6a48 alias: only allow global options before a shell alias, pass later ones through Steve Losh <steve@stevelosh.com> parents: 12276 diff changeset	950 # check for cwd
35233 6e6d0a5b88e6 dispatch: replace _earlyreq() with new fancyopts-based parser Yuya Nishihara <yuya@tcha.org>* parents: 35232 diff changeset	951 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	952 if cwd:
34985 d3d35a55e03b dispatch: convert non-list option parsed by _earlygetopt() to string Yuya Nishihara <yuya@tcha.org> parents: 34984 diff changeset	953 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	954
35233 6e6d0a5b88e6 dispatch: replace _earlyreq() with new fancyopts-based parser Yuya Nishihara <yuya@tcha.org>* parents: 35232 diff changeset	955 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	956 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	957
32331 bd872f64a8ba cleanup: use set literals Martin von Zweigbergk <martinvonz@google.com> parents: 32207 diff changeset	958 uis = {ui, lui}
30953 69a3c6c8bf95 dispatch: move detection of profiling earlier during startup Bryan O'Sullivan <bryano@fb.com> parents: 30937 diff changeset	959
69a3c6c8bf95 dispatch: move detection of profiling earlier during startup Bryan O'Sullivan <bryano@fb.com> parents: 30937 diff changeset	960 if req.repo:
69a3c6c8bf95 dispatch: move detection of profiling earlier during startup Bryan O'Sullivan <bryano@fb.com> parents: 30937 diff changeset	961 uis.add(req.repo.ui)
69a3c6c8bf95 dispatch: move detection of profiling earlier during startup Bryan O'Sullivan <bryano@fb.com> parents: 30937 diff changeset	962
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	963 if (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	964 req.earlyoptions['verbose']
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	965 or req.earlyoptions['debug']
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	966 or req.earlyoptions['quiet']
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	967 ):
38535 b86664c81833 debug: process --debug flag earlier Boris Feld <boris.feld@octobus.net> parents: 38143 diff changeset	968 for opt in ('verbose', 'debug', 'quiet'):
b86664c81833 debug: process --debug flag earlier Boris Feld <boris.feld@octobus.net> parents: 38143 diff changeset	969 val = pycompat.bytestr(bool(req.earlyoptions[opt]))
b86664c81833 debug: process --debug flag earlier Boris Feld <boris.feld@octobus.net> parents: 38143 diff changeset	970 for ui_ in uis:
b86664c81833 debug: process --debug flag earlier Boris Feld <boris.feld@octobus.net> parents: 38143 diff changeset	971 ui_.setconfig('ui', opt, val, '--' + opt)
b86664c81833 debug: process --debug flag earlier Boris Feld <boris.feld@octobus.net> parents: 38143 diff changeset	972
35233 6e6d0a5b88e6 dispatch: replace _earlyreq() with new fancyopts-based parser Yuya Nishihara <yuya@tcha.org>* parents: 35232 diff changeset	973 if req.earlyoptions['profile']:
30953 69a3c6c8bf95 dispatch: move detection of profiling earlier during startup Bryan O'Sullivan <bryano@fb.com> parents: 30937 diff changeset	974 for ui_ in uis:
69a3c6c8bf95 dispatch: move detection of profiling earlier during startup Bryan O'Sullivan <bryano@fb.com> parents: 30937 diff changeset	975 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	976
32808 eede022fc142 profile: drop maybeprofile Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32807 diff changeset	977 profile = lui.configbool('profiling', 'enabled')
eede022fc142 profile: drop maybeprofile Pierre-Yves David <pierre-yves.david@octobus.net> parents: 32807 diff changeset	978 with profiling.profile(lui, enabled=profile) as profiler:
30954 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	979 # 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	980 # reposetup
30954 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	981 extensions.loadall(lui)
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	982 # Propagate any changes to lui.__class__ by extensions
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	983 ui.__class__ = lui.__class__
5828 863e237b58fb dispatch: allow extensions to provide setup code Kirill Smelkov <kirr@mns.spb.ru> parents: 5664 diff changeset	984
30954 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	985 # (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	986
30954 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	987 # (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	988
30954 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	989 addaliases(lui, commands.table)
8655 21688b8a594b Move alias into core Brendan Cully <brendan@kublai.com> parents: 8304 diff changeset	990
30954 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	991 # All aliases and commands are completely defined, now.
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	992 # Check abbreviation/ambiguity of shell alias.
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	993 shellaliasfn = _checkshellalias(lui, ui, args)
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	994 if shellaliasfn:
40763 c93d046d4300 extensions: add "uipopulate" hook, called per instance, not per process Yuya Nishihara <yuya@tcha.org> parents: 40694 diff changeset	995 # no additional configs will be set, set up the ui instances
c93d046d4300 extensions: add "uipopulate" hook, called per instance, not per process Yuya Nishihara <yuya@tcha.org> parents: 40694 diff changeset	996 for ui_ in uis:
c93d046d4300 extensions: add "uipopulate" hook, called per instance, not per process Yuya Nishihara <yuya@tcha.org> parents: 40694 diff changeset	997 extensions.populateui(ui_)
30010 b19c2679289c dispatch: make hg --profile wrap reposetup Arun Kulshreshtha <kulshrax@fb.com> parents: 30009 diff changeset	998 return shellaliasfn()
22377 f98abe3146b2 dispatch: check shell alias again after loading extensions (issue4355) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22376 diff changeset	999
30954 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	1000 # check for fallback encoding
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	1001 fallback = lui.config('ui', 'fallbackencoding')
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	1002 if fallback:
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	1003 encoding.fallbackencoding = fallback
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	1004
30954 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	1005 fullargs = args
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	1006 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	1007
40402 106adc261492 logtoprocess: sends the canonical command name to the subprocess Boris Feld <boris.feld@octobus.net> parents: 39823 diff changeset	1008 # 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	1009 req.canonical_command = cmd
106adc261492 logtoprocess: sends the canonical command name to the subprocess Boris Feld <boris.feld@octobus.net> parents: 39823 diff changeset	1010
34986 02845f7441af dispatch: verify result of early command parsing Yuya Nishihara <yuya@tcha.org> parents: 34985 diff changeset	1011 if options["config"] != req.earlyoptions["config"]:
30954 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	1012 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	1013 if options["cwd"] != req.earlyoptions["cwd"]:
30954 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	1014 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	1015 if options["repository"] != req.earlyoptions["repository"]:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1016 raise error.Abort(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1017 _(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1018 "option -R has to be separated from other options (e.g. not "
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1019 "-qR) and --repository may only be abbreviated as --repo!"
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1020 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1021 )
34982 d9aba3730d30 dispatch: abort if early boolean options can't be parsed Yuya Nishihara <yuya@tcha.org> parents: 34981 diff changeset	1022 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	1023 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	1024 # 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	1025
30954 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	1026 if options["encoding"]:
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	1027 encoding.encoding = options["encoding"]
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	1028 if options["encodingmode"]:
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	1029 encoding.encodingmode = options["encodingmode"]
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	1030 if options["time"]:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1031
30954 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	1032 def get_times():
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	1033 t = os.times()
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	1034 if t[4] == 0.0:
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	1035 # Windows leaves this as zero, so use time.clock()
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	1036 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	1037 return t
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1038
30954 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	1039 s = get_times()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1040
30954 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	1041 def print_time():
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	1042 t = get_times()
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	1043 ui.warn(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1044 _("time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n")
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1045 % (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1046 t[4] - s[4],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1047 t[0] - s[0],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1048 t[2] - s[2],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1049 t[1] - s[1],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1050 t[3] - s[3],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1051 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1052 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1053
31958 de5c9d0e02ea atexit: switch to home-grown implementation Bryan O'Sullivan <bryano@fb.com> parents: 31956 diff changeset	1054 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	1055 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	1056 profiler.start()
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	1057
38535 b86664c81833 debug: process --debug flag earlier Boris Feld <boris.feld@octobus.net> parents: 38143 diff changeset	1058 # 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	1059 if options['verbose'] or options['debug'] or options['quiet']:
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	1060 for opt in ('verbose', 'debug', 'quiet'):
38535 b86664c81833 debug: process --debug flag earlier Boris Feld <boris.feld@octobus.net> parents: 38143 diff changeset	1061 if options[opt] == req.earlyoptions[opt]:
b86664c81833 debug: process --debug flag earlier Boris Feld <boris.feld@octobus.net> parents: 38143 diff changeset	1062 continue
35938 a2b3b5c5a25a py3: replace "if ispy3" by pycompat.bytestr() Yuya Nishihara <yuya@tcha.org> parents: 35653 diff changeset	1063 val = pycompat.bytestr(bool(options[opt]))
30954 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	1064 for ui_ in uis:
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	1065 ui_.setconfig('ui', opt, val, '--' + opt)
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	1066
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	1067 if options['traceback']:
14752 99ace3cb7352 dispatch: set global options on the request repo.ui Idan Kamara <idankk86@gmail.com> parents: 14748 diff changeset	1068 for ui_ in uis:
30954 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	1069 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	1070
30954 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	1071 if options['noninteractive']:
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	1072 for ui_ in uis:
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	1073 ui_.setconfig('ui', 'interactive', 'off', '-y')
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	1074
30954 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	1075 if cmdoptions.get('insecure', False):
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	1076 for ui_ in uis:
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	1077 ui_.insecureconnections = True
13328 a939f08fae9c url: add --insecure option to bypass verification of ssl certificates Yuya Nishihara <yuya@tcha.org> parents: 12932 diff changeset	1078
32125 f928d53b687c dispatch: setup color before pager for correct console information on windows FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32054 diff changeset	1079 # 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	1080 # 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	1081 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	1082 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	1083 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	1084 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	1085 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	1086
37087 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36752 diff changeset	1087 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	1088 # 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	1089 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	1090 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	1091 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	1092 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	1093
40763 c93d046d4300 extensions: add "uipopulate" hook, called per instance, not per process Yuya Nishihara <yuya@tcha.org> parents: 40694 diff changeset	1094 # configs are fully loaded, set up the ui instances
c93d046d4300 extensions: add "uipopulate" hook, called per instance, not per process Yuya Nishihara <yuya@tcha.org> parents: 40694 diff changeset	1095 for ui_ in uis:
c93d046d4300 extensions: add "uipopulate" hook, called per instance, not per process Yuya Nishihara <yuya@tcha.org> parents: 40694 diff changeset	1096 extensions.populateui(ui_)
c93d046d4300 extensions: add "uipopulate" hook, called per instance, not per process Yuya Nishihara <yuya@tcha.org> parents: 40694 diff changeset	1097
30954 6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	1098 if options['version']:
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	1099 return commands.version_(ui)
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	1100 if options['help']:
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	1101 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	1102 elif not cmd:
6d642ecf1a89 dispatch: start profiling earlier Bryan O'Sullivan <bryano@fb.com> parents: 30953 diff changeset	1103 return commands.help_(ui, 'shortlist')
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	1104
30009 dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	1105 repo = None
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	1106 cmdpats = args[:]
30494 acd30a959980 dispatch: stop supporting non-use of @command Augie Fackler <augie@google.com> parents: 30482 diff changeset	1107 if not func.norepo:
30009 dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	1108 # 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	1109 if not rpath and not cwd:
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	1110 repo = req.repo
14510 eccbb9980ada dispatch: add repo to the request Idan Kamara <idankk86@gmail.com> parents: 14439 diff changeset	1111
30009 dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	1112 if repo:
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	1113 # 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	1114 repo.ui.fin = ui.fin
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	1115 repo.ui.fout = ui.fout
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	1116 repo.ui.ferr = ui.ferr
40634 5542bc9125c9 dispatch: pass around ui.fmsg channel Yuya Nishihara <yuya@tcha.org> parents: 40490 diff changeset	1117 repo.ui.fmsg = ui.fmsg
30009 dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	1118 else:
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	1119 try:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1120 repo = hg.repository(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1121 ui,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1122 path=path,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1123 presetupfuncs=req.prereposetups,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1124 intents=func.intents,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1125 )
30009 dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	1126 if not repo.local():
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1127 raise error.Abort(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1128 _("repository '%s' is not local") % path
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1129 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1130 repo.ui.setconfig(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1131 "bundle", "mainreporoot", repo.root, 'repo'
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1132 )
30009 dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	1133 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	1134 raise
30009 dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	1135 except error.RepoError:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1136 if rpath: # invalid -R path
30009 dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	1137 raise
30494 acd30a959980 dispatch: stop supporting non-use of @command Augie Fackler <augie@google.com> parents: 30482 diff changeset	1138 if not func.optionalrepo:
acd30a959980 dispatch: stop supporting non-use of @command Augie Fackler <augie@google.com> parents: 30482 diff changeset	1139 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	1140 # 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	1141 repos = pycompat.maplist(cmdutil.findrepo, args)
30009 dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	1142 guess = repos[0]
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	1143 if guess and repos.count(guess) == len(repos):
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	1144 req.args = ['--repository', guess] + fullargs
35233 6e6d0a5b88e6 dispatch: replace _earlyreq() with new fancyopts-based parser Yuya Nishihara <yuya@tcha.org>* parents: 35232 diff changeset	1145 req.earlyoptions['repository'] = guess
30009 dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	1146 return _dispatch(req)
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	1147 if not path:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1148 raise error.RepoError(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1149 _(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1150 "no repository found in"
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1151 " '%s' (.hg not found)"
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1152 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1153 % encoding.getcwd()
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1154 )
30009 dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	1155 raise
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	1156 if repo:
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	1157 ui = repo.ui
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	1158 if options['hidden']:
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	1159 repo = repo.unfiltered()
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	1160 args.insert(0, repo)
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	1161 elif rpath:
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	1162 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	1163
31499 3c77414a0f9c dispatch: consolidate formatting of arguments Augie Fackler <augie@google.com> parents: 31498 diff changeset	1164 msg = _formatargs(fullargs)
30009 dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	1165 ui.log("command", '%s\n', msg)
30591 2d555d753f0e py3: make keys of keyword arguments strings Pulkit Goyal <7895pulkit@gmail.com> parents: 30581 diff changeset	1166 strcmdopt = pycompat.strkwargs(cmdoptions)
2d555d753f0e py3: make keys of keyword arguments strings Pulkit Goyal <7895pulkit@gmail.com> parents: 30581 diff changeset	1167 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	1168 try:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1169 return runcommand(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1170 lui, repo, cmd, fullargs, ui, options, d, cmdpats, cmdoptions
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1171 )
30009 dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	1172 finally:
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	1173 if repo and repo != req.repo:
dfd97e60044c dispatch: change indentation level in _dispatch() Arun Kulshreshtha <kulshrax@fb.com> parents: 29888 diff changeset	1174 repo.close()
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	1175
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1176
5178 18a9fbb5cd78 dispatch: move command dispatching into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	1177 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	1178 """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	1179 try:
39529 ec0a2601bc76 tracing: trace command function execution Boris Feld <boris.feld@octobus.net> parents: 39283 diff changeset	1180 with tracing.log("Running %s command" % cmd):
ec0a2601bc76 tracing: trace command function execution Boris Feld <boris.feld@octobus.net> parents: 39283 diff changeset	1181 return cmdfunc()
30010 b19c2679289c dispatch: make hg --profile wrap reposetup Arun Kulshreshtha <kulshrax@fb.com> parents: 30009 diff changeset	1182 except error.SignatureError:
b19c2679289c dispatch: make hg --profile wrap reposetup Arun Kulshreshtha <kulshrax@fb.com> parents: 30009 diff changeset	1183 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	1184
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1185
28821 d3369dc6c1d0 dispatch: split out warning message generation to separate function Martijn Pieters <mjpieters@fb.com> parents: 28784 diff changeset	1186 def _exceptionwarning(ui):
d3369dc6c1d0 dispatch: split out warning message generation to separate function Martijn Pieters <mjpieters@fb.com> parents: 28784 diff changeset	1187 """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	1188
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1189 # 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	1190 # 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	1191 # 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	1192 # 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	1193 # '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	1194 # 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	1195 # version number and try updating.
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1196 ct = util.versiontuple(n=2)
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1197 worst = None, ct, ''
33499 0407a51b9d8c codemod: register core configitems using a script Jun Wu <quark@fb.com> parents: 33065 diff changeset	1198 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	1199 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	1200 # '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	1201 # 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	1202 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	1203 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	1204 if not testedwith.strip():
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1205 # 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	1206 worst = name, 'unknown', report
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1207 break
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1208
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1209 # Never blame on extensions bundled with Mercurial.
29888 ed793f41e83f extensions: use ismoduleinternal() thoroughly Yuya Nishihara <yuya@tcha.org> parents: 29857 diff changeset	1210 if extensions.ismoduleinternal(mod):
28784 09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1211 continue
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1212
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1213 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	1214 if ct in tested:
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1215 continue
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1216
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1217 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	1218 nearest = max(lower or tested)
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1219 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	1220 worst = name, nearest, report
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1221 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	1222 name, testedwith, report = worst
31189 49ad6bf63107 dispatch: allow testedwith to be bytes or str Augie Fackler <raf@durin42.com> parents: 31127 diff changeset	1223 if not isinstance(testedwith, (bytes, str)):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1224 testedwith = '.'.join(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1225 [stringutil.forcebytestr(c) for c in testedwith]
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1226 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1227 warning = _(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1228 '** Unknown exception encountered with '
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1229 'possibly-broken third-party extension %s\n'
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1230 '** which supports versions %s of Mercurial.\n'
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1231 '** Please disable %s and try your action again.\n'
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1232 '** If that fixes the bug please report it to %s\n'
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1233 ) % (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	1234 else:
33499 0407a51b9d8c codemod: register core configitems using a script Jun Wu <quark@fb.com> parents: 33065 diff changeset	1235 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	1236 if bugtracker is None:
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1237 bugtracker = _("https://mercurial-scm.org/wiki/BugTracker")
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1238 warning = (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1239 _(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1240 "** unknown exception encountered, "
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1241 "please report by visiting\n** "
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1242 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1243 + bugtracker
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1244 + '\n'
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1245 )
35939 d5457d94e1c9 py3: replace "if ispy3" by pycompat.sysbytes() or util.forcebytestr() Yuya Nishihara <yuya@tcha.org> parents: 35938 diff changeset	1246 sysversion = pycompat.sysbytes(sys.version).replace('\n', '')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1247 warning += (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1248 (_("** Python %s\n") % sysversion)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1249 + (_("** Mercurial Distributed SCM (version %s)\n") % util.version())
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1250 + (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1251 _("** Extensions loaded: %s\n")
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1252 % ", ".join([x[0] for x in extensions.extensions()])
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1253 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1254 )
28821 d3369dc6c1d0 dispatch: split out warning message generation to separate function Martijn Pieters <mjpieters@fb.com> parents: 28784 diff changeset	1255 return warning
d3369dc6c1d0 dispatch: split out warning message generation to separate function Martijn Pieters <mjpieters@fb.com> parents: 28784 diff changeset	1256
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1257
28821 d3369dc6c1d0 dispatch: split out warning message generation to separate function Martijn Pieters <mjpieters@fb.com> parents: 28784 diff changeset	1258 def handlecommandexception(ui):
d3369dc6c1d0 dispatch: split out warning message generation to separate function Martijn Pieters <mjpieters@fb.com> parents: 28784 diff changeset	1259 """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	1260
d3369dc6c1d0 dispatch: split out warning message generation to separate function Martijn Pieters <mjpieters@fb.com> parents: 28784 diff changeset	1261 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	1262 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	1263 """
d3369dc6c1d0 dispatch: split out warning message generation to separate function Martijn Pieters <mjpieters@fb.com> parents: 28784 diff changeset	1264 warning = _exceptionwarning(ui)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1265 ui.log(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1266 "commandexception",
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1267 "%s\n%s\n",
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1268 warning,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1269 pycompat.sysbytes(traceback.format_exc()),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41193 diff changeset	1270 )
28784 09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1271 ui.warn(warning)
09750b1231c2 dispatch: factor out command failure handling into a function Martijn Pieters <mjpieters@fb.com> parents: 28695 diff changeset	1272 return False # re-raise the exception

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/dispatch.py @ 43076:2372284d9457