This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3143

context: move handling of filtering error to revsymbol() (API)
ClosedPublic

Authored by martinvonz on Apr 5 2018, 6:07 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGecd3f6909184: context: move handling of filtering error to revsymbol() (API)
Summary

When changectx's constructor runs into various Filtered*Error, it
creates an exception with a hint about using --hidden. This only makes
sense when the revision was provided by the user (if we get e.g. a
FilteredLookupError from repo[p1], then it's instead a programming
error). Thus, I'm moving the handling into revsymbol(). Also changed
"unfilteredrepo[changeid]" to "revsymbol(unfilteredrepo, changeid)" as
part of the move.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (28 lines)
Mmercurial/localrepo.py (3 lines)
Mmercurial/scmutil.py (31 lines)

Diff 7775

mercurial/context.py

) )
from . import ( from . import (
dagop, dagop,
encoding, encoding,
error, error,
fileset, fileset,
match as matchmod, match as matchmod,
obsolete as obsmod, obsolete as obsmod,
obsutil,
patch, patch,
pathutil, pathutil,
phases, phases,
pycompat, pycompat,
repoview, repoview,
revlog, revlog,
scmutil, scmutil,
sparse, sparse,
for rfiles, sfiles in zip(r, s): for rfiles, sfiles in zip(r, s):
rfiles.extend("%s/%s" % (subpath, f) for f in sfiles) rfiles.extend("%s/%s" % (subpath, f) for f in sfiles)
for l in r: for l in r:
l.sort() l.sort()
return r return r
def _filterederror(repo, changeid):
"""build an exception to be raised about a filtered changeid
This is extracted in a function to help extensions (eg: evolve) to
experiment with various message variants."""
if repo.filtername.startswith('visible'):
# Check if the changeset is obsolete
unfilteredrepo = repo.unfiltered()
ctx = unfilteredrepo[changeid]
# If the changeset is obsolete, enrich the message with the reason
# that made this changeset not visible
if ctx.obsolete():
msg = obsutil._getfilteredreason(repo, changeid, ctx)
else:
msg = _("hidden revision '%s'") % changeid
hint = _('use --hidden to access hidden revisions')
return error.FilteredRepoLookupError(msg, hint=hint)
msg = _("filtered revision '%s' (not in '%s' subset)")
msg %= (changeid, repo.filtername)
return error.FilteredRepoLookupError(msg)
class changectx(basectx): class changectx(basectx):
"""A changecontext object makes access to data related to a particular """A changecontext object makes access to data related to a particular
changeset convenient. It represents a read-only context already present in changeset convenient. It represents a read-only context already present in
the repo.""" the repo."""
def __init__(self, repo, changeid='.'): def __init__(self, repo, changeid='.'):
"""changeid is a revision number, node, or tag""" """changeid is a revision number, node, or tag"""
super(changectx, self).__init__(repo) super(changectx, self).__init__(repo)
raise error.Abort(msg % short(changeid)) raise error.Abort(msg % short(changeid))
try: try:
if len(changeid) == 20 and nonascii(changeid): if len(changeid) == 20 and nonascii(changeid):
changeid = hex(changeid) changeid = hex(changeid)
except TypeError: except TypeError:
pass pass
except (error.FilteredIndexError, error.FilteredLookupError, except (error.FilteredIndexError, error.FilteredLookupError,
error.FilteredRepoLookupError): error.FilteredRepoLookupError):
raise _filterederror(repo, changeid) raise
except IndexError: except IndexError:
pass pass
raise error.RepoLookupError( raise error.RepoLookupError(
_("unknown revision '%s'") % changeid) _("unknown revision '%s'") % changeid)
def __hash__(self): def __hash__(self):
try: try:
return hash(self._rev) return hash(self._rev)

mercurial/localrepo.py

def __contains__(self, changeid): def __contains__(self, changeid):
"""True if the given changeid exists """True if the given changeid exists
error.LookupError is raised if an ambiguous node specified. error.LookupError is raised if an ambiguous node specified.
""" """
try: try:
self[changeid] self[changeid]
return True return True
except error.RepoLookupError: except (error.RepoLookupError, error.FilteredIndexError,
error.FilteredLookupError):
return False return False
def __nonzero__(self): def __nonzero__(self):
return True return True
__bool__ = __nonzero__ __bool__ = __nonzero__
def __len__(self): def __len__(self):

mercurial/scmutil.py

This is similar to revsingle(), but accepts only a single revision symbol, This is similar to revsingle(), but accepts only a single revision symbol,
i.e. things like ".", "tip", "1234", "deadbeef", "my-bookmark" work, but i.e. things like ".", "tip", "1234", "deadbeef", "my-bookmark" work, but
not "max(public())". not "max(public())".
""" """
if not isinstance(symbol, bytes): if not isinstance(symbol, bytes):
msg = ("symbol (%s of type %s) was not a string, did you mean " msg = ("symbol (%s of type %s) was not a string, did you mean "
"repo[symbol]?" % (symbol, type(symbol))) "repo[symbol]?" % (symbol, type(symbol)))
raise error.ProgrammingError(msg) raise error.ProgrammingError(msg)
try:
return repo[symbol] return repo[symbol]
except (error.FilteredIndexError, error.FilteredLookupError,
error.FilteredRepoLookupError):
raise _filterederror(repo, symbol)
def _filterederror(repo, changeid):
"""build an exception to be raised about a filtered changeid
This is extracted in a function to help extensions (eg: evolve) to
experiment with various message variants."""
if repo.filtername.startswith('visible'):
# Check if the changeset is obsolete
unfilteredrepo = repo.unfiltered()
ctx = revsymbol(unfilteredrepo, changeid)
# If the changeset is obsolete, enrich the message with the reason
# that made this changeset not visible
if ctx.obsolete():
msg = obsutil._getfilteredreason(repo, changeid, ctx)
else:
msg = _("hidden revision '%s'") % changeid
hint = _('use --hidden to access hidden revisions')
return error.FilteredRepoLookupError(msg, hint=hint)
msg = _("filtered revision '%s' (not in '%s' subset)")
msg %= (changeid, repo.filtername)
return error.FilteredRepoLookupError(msg)
def revsingle(repo, revspec, default='.', localalias=None): def revsingle(repo, revspec, default='.', localalias=None):
if not revspec and revspec != 0: if not revspec and revspec != 0:
return repo[default] return repo[default]
l = revrange(repo, [revspec], localalias=localalias) l = revrange(repo, [revspec], localalias=localalias)
if not l: if not l:
raise error.Abort(_('empty revision set')) raise error.Abort(_('empty revision set'))