##// END OF EJS Templates
strip: make query to get new bookmark target cheaper...
strip: make query to get new bookmark target cheaper The current query to get the new bookmark target for stripped revisions involves multiple walks up the DAG, and is really expensive, taking over 2.5 seconds on a repository with over 400,000 changesets even if just one changeset is being stripped. A slightly simplified version of the current query is max(heads(::<tostrip> - <tostrip>)) We make two observations here. 1. For any set s, max(heads(s)) == max(s). That is because revision numbers define a topological order, so that the element with the highest revision number in s will not have any children in s. 2. For any set s, max(::s - s) == max(parents(s) - s). In other words, the ancestor of s with the highest revision number not in s is a parent of one of the revs in s. Why? Because if it were an ancestor but not a parent of s, it would have a descendant that would be a parent of s. This descendant would have a higher revision number, leading to a contradiction. Combining these two observations, we rewrite the revset query as max(parents(<tostrip>) - <tostrip>) The time complexity is now linear in the number of changesets being stripped. For the above repository, the query now takes 0.1 seconds when one changeset is stripped. This speeds up operations that use repair.strip, like the rebase and strip commands.

File last commit:

r15017:f4522df3 default
r18040:fe8caf28 default
Show More
error.py
90 lines | 2.5 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
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
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