| mharbison72 |
| hg-reviewers |
I plan to reuse formatparse() in the next patch.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/chgserver.py (5 lines) | |||
| M | mercurial/dispatch.py (41 lines) | |||
| M | mercurial/scmutil.py (33 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| from . import ( | from . import ( | ||||
| commandserver, | commandserver, | ||||
| encoding, | encoding, | ||||
| error, | error, | ||||
| extensions, | extensions, | ||||
| node, | node, | ||||
| pycompat, | pycompat, | ||||
| scmutil, | |||||
| util, | util, | ||||
| ) | ) | ||||
| from .utils import ( | from .utils import ( | ||||
| hashutil, | hashutil, | ||||
| procutil, | procutil, | ||||
| stringutil, | stringutil, | ||||
| ) | ) | ||||
| - "exit $n", the client should exit directly with code n. | - "exit $n", the client should exit directly with code n. | ||||
| This may happen if we cannot parse the config. | This may happen if we cannot parse the config. | ||||
| - "reconnect", the client should close the connection and | - "reconnect", the client should close the connection and | ||||
| reconnect. | reconnect. | ||||
| If neither "reconnect" nor "redirect" is included in the instruction | If neither "reconnect" nor "redirect" is included in the instruction | ||||
| list, the client can continue with this server after completing all | list, the client can continue with this server after completing all | ||||
| the instructions. | the instructions. | ||||
| """ | """ | ||||
| from . import dispatch # avoid cycle | |||||
| args = self._readlist() | args = self._readlist() | ||||
| try: | try: | ||||
| self.ui, lui = _loadnewui(self.ui, args, self.cdebug) | self.ui, lui = _loadnewui(self.ui, args, self.cdebug) | ||||
| except error.ParseError as inst: | except error.ParseError as inst: | ||||
| dispatch._formatparse(self.ui.warn, inst) | scmutil.formatparse(self.ui.warn, inst) | ||||
| self.ui.flush() | self.ui.flush() | ||||
| self.cresult.write(b'exit 255') | self.cresult.write(b'exit 255') | ||||
| return | return | ||||
| except error.Abort as inst: | except error.Abort as inst: | ||||
| self.ui.error(_(b"abort: %s\n") % inst.message) | self.ui.error(_(b"abort: %s\n") % inst.message) | ||||
| if inst.hint: | if inst.hint: | ||||
| self.ui.error(_(b"(%s)\n") % inst.hint) | self.ui.error(_(b"(%s)\n") % inst.hint) | ||||
| self.ui.flush() | self.ui.flush() | ||||
| # dispatch.py - command dispatching for mercurial | # dispatch.py - command dispatching for mercurial | ||||
| # | # | ||||
| # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> | ||||
| # | # | ||||
| # This software may be used and distributed according to the terms of the | # This software may be used and distributed according to the terms of the | ||||
| # GNU General Public License version 2 or any later version. | # GNU General Public License version 2 or any later version. | ||||
| from __future__ import absolute_import, print_function | from __future__ import absolute_import, print_function | ||||
| import difflib | |||||
| import errno | import errno | ||||
| import getopt | import getopt | ||||
| import io | import io | ||||
| import os | import os | ||||
| import pdb | import pdb | ||||
| import re | import re | ||||
| import signal | import signal | ||||
| import sys | import sys | ||||
| def initstdio(): | def initstdio(): | ||||
| for fp in (sys.stdin, sys.stdout, sys.stderr): | for fp in (sys.stdin, sys.stdout, sys.stderr): | ||||
| procutil.setbinary(fp) | procutil.setbinary(fp) | ||||
| def _silencestdio(): | def _silencestdio(): | ||||
| pass | pass | ||||
| def _getsimilar(symbols, value): | |||||
| sim = lambda x: difflib.SequenceMatcher(None, value, x).ratio() | |||||
| # The cutoff for similarity here is pretty arbitrary. It should | |||||
| # probably be investigated and tweaked. | |||||
| return [s for s in symbols if sim(s) > 0.6] | |||||
| def _reportsimilar(write, similar): | |||||
| if len(similar) == 1: | |||||
| write(_(b"(did you mean %s?)\n") % similar[0]) | |||||
| elif similar: | |||||
| ss = b", ".join(sorted(similar)) | |||||
| write(_(b"(did you mean one of %s?)\n") % ss) | |||||
| def _formatparse(write, inst): | |||||
| similar = [] | |||||
| if isinstance(inst, error.UnknownIdentifier): | |||||
| # make sure to check fileset first, as revset can invoke fileset | |||||
| similar = _getsimilar(inst.symbols, inst.function) | |||||
| if inst.location is not None: | |||||
| write( | |||||
| _(b"hg: parse error at %s: %s\n") | |||||
| % (pycompat.bytestr(inst.location), inst.message) | |||||
| ) | |||||
| else: | |||||
| write(_(b"hg: parse error: %s\n") % inst.message) | |||||
| _reportsimilar(write, similar) | |||||
| if inst.hint: | |||||
| write(_(b"(%s)\n") % inst.hint) | |||||
| def _formatargs(args): | def _formatargs(args): | ||||
| return b' '.join(procutil.shellquote(a) for a in args) | return b' '.join(procutil.shellquote(a) for a in args) | ||||
| def dispatch(req): | def dispatch(req): | ||||
| """run the command specified in req.args; returns an integer status code""" | """run the command specified in req.args; returns an integer status code""" | ||||
| with tracing.log('dispatch.dispatch'): | with tracing.log('dispatch.dispatch'): | ||||
| if req.ferr: | if req.ferr: | ||||
| if req.fmsg: | if req.fmsg: | ||||
| req.ui.fmsg = req.fmsg | req.ui.fmsg = req.fmsg | ||||
| except error.Abort as inst: | except error.Abort as inst: | ||||
| ferr.write(_(b"abort: %s\n") % inst.message) | ferr.write(_(b"abort: %s\n") % inst.message) | ||||
| if inst.hint: | if inst.hint: | ||||
| ferr.write(_(b"(%s)\n") % inst.hint) | ferr.write(_(b"(%s)\n") % inst.hint) | ||||
| return -1 | return -1 | ||||
| except error.ParseError as inst: | except error.ParseError as inst: | ||||
| _formatparse(ferr.write, inst) | scmutil.formatparse(ferr.write, inst) | ||||
| return -1 | return -1 | ||||
| msg = _formatargs(req.args) | msg = _formatargs(req.args) | ||||
| starttime = util.timer() | starttime = util.timer() | ||||
| ret = 1 # default of Python exit code on unhandled exception | ret = 1 # default of Python exit code on unhandled exception | ||||
| try: | try: | ||||
| ret = _runcatch(req) or 0 | ret = _runcatch(req) or 0 | ||||
| except error.ProgrammingError as inst: | except error.ProgrammingError as inst: | ||||
| ui.pager(b'help') | ui.pager(b'help') | ||||
| msgbytes = pycompat.bytestr(inst.message) | msgbytes = pycompat.bytestr(inst.message) | ||||
| ui.warn(_(b"hg %s: %s\n") % (inst.command, msgbytes)) | ui.warn(_(b"hg %s: %s\n") % (inst.command, msgbytes)) | ||||
| commands.help_(ui, inst.command, full=False, command=True) | commands.help_(ui, inst.command, full=False, command=True) | ||||
| else: | else: | ||||
| ui.warn(_(b"hg: %s\n") % inst.message) | ui.warn(_(b"hg: %s\n") % inst.message) | ||||
| ui.warn(_(b"(use 'hg help -v' for a list of global options)\n")) | ui.warn(_(b"(use 'hg help -v' for a list of global options)\n")) | ||||
| except error.ParseError as inst: | except error.ParseError as inst: | ||||
| _formatparse(ui.warn, inst) | scmutil.formatparse(ui.warn, inst) | ||||
| return -1 | return -1 | ||||
| except error.UnknownCommand as inst: | except error.UnknownCommand as inst: | ||||
| nocmdmsg = _(b"hg: unknown command '%s'\n") % inst.command | nocmdmsg = _(b"hg: unknown command '%s'\n") % inst.command | ||||
| try: | try: | ||||
| # check if the command is in a disabled extension | # check if the command is in a disabled extension | ||||
| # (but don't check for extensions themselves) | # (but don't check for extensions themselves) | ||||
| formatted = help.formattedhelp( | formatted = help.formattedhelp( | ||||
| ui, commands, inst.command, unknowncmd=True | ui, commands, inst.command, unknowncmd=True | ||||
| ) | ) | ||||
| ui.warn(nocmdmsg) | ui.warn(nocmdmsg) | ||||
| ui.write(formatted) | ui.write(formatted) | ||||
| except (error.UnknownCommand, error.Abort): | except (error.UnknownCommand, error.Abort): | ||||
| suggested = False | suggested = False | ||||
| if inst.all_commands: | if inst.all_commands: | ||||
| sim = _getsimilar(inst.all_commands, inst.command) | sim = scmutil.getsimilar(inst.all_commands, inst.command) | ||||
| if sim: | if sim: | ||||
| ui.warn(nocmdmsg) | ui.warn(nocmdmsg) | ||||
| _reportsimilar(ui.warn, sim) | scmutil.reportsimilar(ui.warn, sim) | ||||
| suggested = True | suggested = True | ||||
| if not suggested: | if not suggested: | ||||
| ui.warn(nocmdmsg) | ui.warn(nocmdmsg) | ||||
| ui.warn(_(b"(use 'hg help' for a list of commands)\n")) | ui.warn(_(b"(use 'hg help' for a list of commands)\n")) | ||||
| except IOError: | except IOError: | ||||
| raise | raise | ||||
| except KeyboardInterrupt: | except KeyboardInterrupt: | ||||
| raise | raise | ||||
| # scmutil.py - Mercurial core utility functions | # scmutil.py - Mercurial core utility functions | ||||
| # | # | ||||
| # Copyright Matt Mackall <mpm@selenic.com> | # Copyright Matt Mackall <mpm@selenic.com> | ||||
| # | # | ||||
| # This software may be used and distributed according to the terms of the | # This software may be used and distributed according to the terms of the | ||||
| # GNU General Public License version 2 or any later version. | # GNU General Public License version 2 or any later version. | ||||
| from __future__ import absolute_import | from __future__ import absolute_import | ||||
| import difflib | |||||
| import errno | import errno | ||||
| import glob | import glob | ||||
| import os | import os | ||||
| import posixpath | import posixpath | ||||
| import re | import re | ||||
| import subprocess | import subprocess | ||||
| import weakref | import weakref | ||||
| ui.status( | ui.status( | ||||
| _(b"no changes found (ignored %d secret changesets)\n") | _(b"no changes found (ignored %d secret changesets)\n") | ||||
| % len(secretlist) | % len(secretlist) | ||||
| ) | ) | ||||
| else: | else: | ||||
| ui.status(_(b"no changes found\n")) | ui.status(_(b"no changes found\n")) | ||||
| def getsimilar(symbols, value): | |||||
| sim = lambda x: difflib.SequenceMatcher(None, value, x).ratio() | |||||
| # The cutoff for similarity here is pretty arbitrary. It should | |||||
| # probably be investigated and tweaked. | |||||
| return [s for s in symbols if sim(s) > 0.6] | |||||
| def reportsimilar(write, similar): | |||||
| if len(similar) == 1: | |||||
| write(_(b"(did you mean %s?)\n") % similar[0]) | |||||
| elif similar: | |||||
| ss = b", ".join(sorted(similar)) | |||||
| write(_(b"(did you mean one of %s?)\n") % ss) | |||||
| def formatparse(write, inst): | |||||
| similar = [] | |||||
| if isinstance(inst, error.UnknownIdentifier): | |||||
| # make sure to check fileset first, as revset can invoke fileset | |||||
| similar = getsimilar(inst.symbols, inst.function) | |||||
| if inst.location is not None: | |||||
| write( | |||||
| _(b"hg: parse error at %s: %s\n") | |||||
| % (pycompat.bytestr(inst.location), inst.message) | |||||
| ) | |||||
| else: | |||||
| write(_(b"hg: parse error: %s\n") % inst.message) | |||||
| reportsimilar(write, similar) | |||||
| if inst.hint: | |||||
| write(_(b"(%s)\n") % inst.hint) | |||||
| def callcatch(ui, func): | def callcatch(ui, func): | ||||
| """call func() with global exception handling | """call func() with global exception handling | ||||
| return func() if no exception happens. otherwise do some error handling | return func() if no exception happens. otherwise do some error handling | ||||
| and return an exit code accordingly. does not handle all exceptions. | and return an exit code accordingly. does not handle all exceptions. | ||||
| """ | """ | ||||
| coarse_exit_code = -1 | coarse_exit_code = -1 | ||||
| detailed_exit_code = -1 | detailed_exit_code = -1 | ||||