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

annotate mercurial/dispatch.py @ 46172:d04c0e494cfe

dispatch: remove stale comment about fdopen()-ed stdio On Python 3, stdout is just wrapped by LineBufferedWrapper.

author	Yuya Nishihara <yuya@tcha.org>
date	Fri, 18 Dec 2020 20:35:11 +0900
parents	db5dddb38f5b
children	a9765e0a461d

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

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/dispatch.py @ 46172:d04c0e494cfe