##// END OF EJS Templates
revpair: restrict odd-range handling to top-level x:y expression (issue4774)...
revpair: restrict odd-range handling to top-level x:y expression (issue4774) The odd-range hack was introduced by 2a0efa1112ac for backward compatibility, but it was too widely applied. I've checked cmdutil.revpair() at 1.6, and found that ".:", ":0" and ":" are also handled as pairs. So let's enable the hack only for "x:y", "x:", "y:" and ":". test-revset.t is updated because "tip^::tip^ or tip^" shouldn't be taken as an odd range. This patch adds "tip^:tip^" instead. This patch is written for the default branch because parse() of the stable branch lacks compatibility hack for "foo+bar" tag. If we want to mitigate the issue in stable, we can add something like "and '::' in revs[0]".

File last commit:

r25945:147bd9e2 default
r26020:cc3a30ff default
Show More
error.py
188 lines | 5.6 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.
"""
Gregory Szorc
error: use absolute_import
r25945 from __future__ import absolute_import
Matt Mackall
errors: move revlog errors...
r7633 # Do not import anything here, please
Jordi Gutiérrez Hermoso
error: refactor common hint-pattern into a common base class...
r25248 class HintException(Exception):
def __init__(self, *args, **kw):
Exception.__init__(self, *args)
self.hint = kw.get('hint')
Jordi Gutiérrez Hermoso
error: derive RevlogError from HintException instead of Exception...
r25249 class RevlogError(HintException):
Matt Mackall
errors: move revlog errors...
r7633 pass
Pierre-Yves David
repoview: add a FilteredIndexError class...
r23014 class FilteredIndexError(IndexError):
pass
Matt Mackall
errors: move revlog errors...
r7633 class LookupError(RevlogError, KeyError):
def __init__(self, name, index, message):
self.name = name
Martin von Zweigbergk
error: store filename and message on LookupError for later...
r24038 self.index = index
Siddharth Agarwal
error.LookupError: rename 'message' property to something else...
r24137 # this can't be called 'message' because at least some installs of
# Python 2.6+ complain about the 'message' property being deprecated
self.lookupmessage = message
Matt Mackall
errors: move revlog errors...
r7633 if isinstance(name, str) and len(name) == 20:
Gregory Szorc
error: use absolute_import
r25945 from .node import short
Matt Mackall
errors: move revlog errors...
r7633 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
Pierre-Yves David
repoview: add a FilteredLookupError class...
r23015 class FilteredLookupError(LookupError):
pass
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."""
Jordi Gutiérrez Hermoso
error: refactor common hint-pattern into a common base class...
r25248 class Abort(HintException):
Matt Mackall
error: add new ParseError for various parsing errors
r11288 """Raised if a command needs to print an error and exit."""
Jordi Gutiérrez Hermoso
error: refactor common hint-pattern into a common base class...
r25248 pass
Matt Mackall
error: add new ParseError for various parsing errors
r11288
Pierre-Yves David
hook: raise a more specialized HookAbort exception when a hook fails...
r23415 class HookAbort(Abort):
"""raised when a validation hook fails, aborting an operation
Exists to allow more specialized catching."""
pass
Matt Mackall
error: add new ParseError for various parsing errors
r11288 class ConfigError(Abort):
Mike Edgar
error: use docstrings, not bare strings, for error classes
r22359 """Exception raised when parsing config files"""
Matt Mackall
ui: introduce new config parser
r8144
Andrew Pritchard
wireproto: add out-of-band error class to allow remote repo to report errors...
r15017 class OutOfBandError(Exception):
Mike Edgar
error: use docstrings, not bare strings, for error classes
r22359 """Exception raised when a remote repo reports failure"""
Andrew Pritchard
wireproto: add out-of-band error class to allow remote repo to report errors...
r15017
Pierre-Yves David
error: allow a 'hint' to OutOfBandError...
r25242 def __init__(self, *args, **kw):
Exception.__init__(self, *args)
self.hint = kw.get('hint')
Matt Mackall
error: fix up test-hgrc
r11292 class ParseError(Exception):
Augie Fackler
error: update docstring on ParseError...
r24040 """Raised when parsing config files and {rev,file}sets (msg[, pos])"""
Matt Mackall
error: add new ParseError for various parsing errors
r11288
Augie Fackler
error: add a new UnknownIdentifier error type...
r24217 class UnknownIdentifier(ParseError):
"""Exception raised when a {rev,file}set references an unknown identifier"""
def __init__(self, function, symbols):
Gregory Szorc
error: use absolute_import
r25945 from .i18n import _
Augie Fackler
error: add a new UnknownIdentifier error type...
r24217 ParseError.__init__(self, _("unknown identifier: %s") % function)
self.function = function
self.symbols = symbols
Jordi Gutiérrez Hermoso
error: refactor common hint-pattern into a common base class...
r25248 class RepoError(HintException):
pass
Matt Mackall
error: move repo errors...
r7637
Matt Mackall
Make distinct lookup error for localrepo.lookup...
r9423 class RepoLookupError(RepoError):
pass
Pierre-Yves David
repoview: add a FilteredRepoLookupError...
r23016 class FilteredRepoLookupError(RepoLookupError):
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: add an UnsupportedPartError...
r23010 class UnsupportedPartError(BundleValueError):
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
Pierre-Yves David
bundle2: introduce a PushkeyFail error to abort unbundle on pushkey error...
r25484 class PushkeyFailed(Abort):
"""error raised when a pushkey part failed to update a value"""
def __init__(self, partid, namespace=None, key=None, new=None, old=None,
ret=None):
self.partid = partid
self.namespace = namespace
self.key = key
self.new = new
self.old = old
self.ret = ret
# no i18n expected to be processed into a better message
Abort.__init__(self, 'failed to update value for "%s/%s"'
% (namespace, key))
Mike Edgar
error: add CensoredNodeError, will be thrown when content deliberately erased...
r22595 class CensoredNodeError(RevlogError):
Mike Edgar
changegroup: emit full-replacement deltas if either revision is censored...
r24190 """error raised when content verification fails on a censored node
Mike Edgar
error: add CensoredNodeError, will be thrown when content deliberately erased...
r22595
Mike Edgar
changegroup: emit full-replacement deltas if either revision is censored...
r24190 Also contains the tombstone data substituted for the uncensored data.
"""
def __init__(self, filename, node, tombstone):
Gregory Szorc
error: use absolute_import
r25945 from .node import short
Mike Edgar
error: add CensoredNodeError, will be thrown when content deliberately erased...
r22595 RevlogError.__init__(self, '%s:%s' % (filename, short(node)))
Mike Edgar
changegroup: emit full-replacement deltas if either revision is censored...
r24190 self.tombstone = tombstone
Mike Edgar
revlog: in addgroup, reject ill-formed deltas based on censored nodes...
r24120
class CensoredBaseError(RevlogError):
"""error raised when a delta is rejected because its base is censored
A delta based on a censored revision must be formed as single patch
operation which replaces the entire base with new content. This ensures
the delta may be applied by clones which have not censored the base.
"""