##// END OF EJS Templates
parsers: inline fields of dirstate values in C version...
parsers: inline fields of dirstate values in C version Previously, while unpacking the dirstate we'd create 3-4 new CPython objects for most dirstate values: - the state is a single character string, which is pooled by CPython - the mode is a new object if it isn't 0 due to being in the lookup set - the size is a new object if it is greater than 255 - the mtime is a new object if it isn't -1 due to being in the lookup set - the tuple to contain them all In some cases such as regular hg status, we actually look at all the objects. In other cases like hg add, hg status for a subdirectory, or hg status with the third-party hgwatchman enabled, we look at almost none of the objects. This patch eliminates most object creation in these cases by defining a custom C struct that is exposed to Python with an interface similar to a tuple. Only when tuple elements are actually requested are the respective objects created. The gains, where they're expected, are significant. The following tests are run against a working copy with over 270,000 files. parse_dirstate becomes significantly faster: $ hg perfdirstate before: wall 0.186437 comb 0.180000 user 0.160000 sys 0.020000 (best of 35) after: wall 0.093158 comb 0.100000 user 0.090000 sys 0.010000 (best of 95) and as a result, several commands benefit: $ time hg status # with hgwatchman enabled before: 0.42s user 0.14s system 99% cpu 0.563 total after: 0.34s user 0.12s system 99% cpu 0.471 total $ time hg add new-file before: 0.85s user 0.18s system 99% cpu 1.033 total after: 0.76s user 0.17s system 99% cpu 0.931 total There is a slight regression in regular status performance, but this is fixed in an upcoming patch.

File last commit:

r21747:fecead61 default
r21809:e250b830 default
Show More
error.py
119 lines | 3.4 KiB | text/x-python | PythonLexer
Martin Geisler
put license and copyright info into comment blocks
r8226 # error.py - Mercurial exceptions
#
# Copyright 2005-2008 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
Matt Mackall
Update license to GPLv2+
r10263 # GNU General Public License version 2 or any later version.
Matt Mackall
errors: move revlog errors...
r7633
Martin Geisler
turn some comments back into module docstrings
r8227 """Mercurial exceptions.
This allows us to catch exceptions at higher levels without forcing
imports.
"""
Matt Mackall
errors: move revlog errors...
r7633 # Do not import anything here, please
class RevlogError(Exception):
pass
class LookupError(RevlogError, KeyError):
def __init__(self, name, index, message):
self.name = name
if isinstance(name, str) and len(name) == 20:
from node import short
name = short(name)
RevlogError.__init__(self, '%s@%s: %s' % (index, name, message))
def __str__(self):
return RevlogError.__str__(self)
Matt Mackall
error: move ParseError
r7636
Takumi IINO
hgweb: show correct error message for i18n environment...
r18855 class ManifestLookupError(LookupError):
pass
Matt Mackall
error: change ParseError to CommandError
r11287 class CommandError(Exception):
Matt Mackall
error: move ParseError
r7636 """Exception raised on errors in parsing the command line."""
Matt Mackall
error: move repo errors...
r7637
Augie Fackler
error: introduce new InterventionRequired exception...
r18931 class InterventionRequired(Exception):
"""Exception raised when a command requires human intervention."""
Matt Mackall
error: add new ParseError for various parsing errors
r11288 class Abort(Exception):
"""Raised if a command needs to print an error and exit."""
Benoit Boissinot
Abort: add a hint argument, printed in the next line inside parenthesis...
r11574 def __init__(self, *args, **kw):
Exception.__init__(self, *args)
self.hint = kw.get('hint')
Matt Mackall
error: add new ParseError for various parsing errors
r11288
class ConfigError(Abort):
Matt Mackall
ui: introduce new config parser
r8144 'Exception raised when parsing config files'
Andrew Pritchard
wireproto: add out-of-band error class to allow remote repo to report errors...
r15017 class OutOfBandError(Exception):
'Exception raised when a remote repo reports failure'
Matt Mackall
error: fix up test-hgrc
r11292 class ParseError(Exception):
Matt Mackall
error: add new ParseError for various parsing errors
r11288 'Exception raised when parsing config files (msg[, pos])'
Matt Mackall
error: move repo errors...
r7637 class RepoError(Exception):
Pierre-Yves David
error: Add a hint argument to RepoError...
r14761 def __init__(self, *args, **kw):
Exception.__init__(self, *args)
self.hint = kw.get('hint')
Matt Mackall
error: move repo errors...
r7637
Matt Mackall
Make distinct lookup error for localrepo.lookup...
r9423 class RepoLookupError(RepoError):
pass
Matt Mackall
error: move repo errors...
r7637 class CapabilityError(RepoError):
pass
Matt Mackall
error: move lock errors...
r7640
Adrian Buehlmann
introduce new RequirementError (issue2649)...
r13447 class RequirementError(RepoError):
"""Exception raised if .hg/requires has an unknown entry."""
pass
Matt Mackall
error: move lock errors...
r7640 class LockError(IOError):
def __init__(self, errno, strerror, filename, desc):
IOError.__init__(self, errno, strerror, filename)
self.desc = desc
class LockHeld(LockError):
def __init__(self, errno, filename, desc, locker):
LockError.__init__(self, errno, 'Lock held', filename, desc)
self.locker = locker
class LockUnavailable(LockError):
pass
Matt Mackall
error: move UnexpectedOutput (now ResponseError)
r7641
class ResponseError(Exception):
"""Raised to print an error with part of output and exit."""
Matt Mackall
error: move UnknownCommand and AmbiguousCommand
r7643 class UnknownCommand(Exception):
"""Exception raised if command is not in the command table."""
class AmbiguousCommand(Exception):
"""Exception raised if command shortcut matches more than one command."""
Matt Mackall
error: move SignalInterrupt...
r7644 # derived from KeyboardInterrupt to simplify some breakout code
class SignalInterrupt(KeyboardInterrupt):
"""Exception raised on SIGTERM and SIGHUP."""
Matt Mackall
error: move SignatureError
r7646
class SignatureError(Exception):
pass
Pierre-Yves David
bundle2: fix raising errors during heads checking...
r21184
class PushRaced(RuntimeError):
"""An exception raised during unbundling that indicate a push race"""
Pierre-Yves David
bundle2: move exception classes into the error module...
r21618 # bundle2 related errors
class BundleValueError(ValueError):
Pierre-Yves David
bundle2: introduce a ``params`` attribute to BundleValueError...
r21621 """error raised when bundle2 cannot be processed"""
Pierre-Yves David
bundle2: introduce a parttype attribute to BundleValueError...
r21620
Pierre-Yves David
bundle2: support None parttype in BundleValueError...
r21627 def __init__(self, parttype=None, params=()):
Pierre-Yves David
bundle2: introduce a parttype attribute to BundleValueError...
r21620 self.parttype = parttype
Pierre-Yves David
bundle2: introduce a ``params`` attribute to BundleValueError...
r21621 self.params = params
Pierre-Yves David
bundle2: support None parttype in BundleValueError...
r21627 if self.parttype is None:
msg = 'Stream Parameter'
else:
msg = parttype
Pierre-Yves David
bundle2: introduce a ``params`` attribute to BundleValueError...
r21621 if self.params:
msg = '%s - %s' % (msg, ', '.join(self.params))
Brendan Cully
error: restore python 2.4 compatibility for BundleValueError...
r21747 ValueError.__init__(self, msg)
Pierre-Yves David
bundle2: move exception classes into the error module...
r21618
class ReadOnlyPartError(RuntimeError):
"""error raised when code tries to alter a part being generated"""
pass