This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3449

context: drop support for looking up context by ambiguous changeid (API)
ClosedPublic

Authored by martinvonz on May 6 2018, 12:50 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG8b86acc7aa64: context: drop support for looking up context by ambiguous changeid (API)
Summary

This removes support for using the changectx constructor (and thereby
repo[x]) for looking up contexts by a stringified int, a namespace key
(e.g. a bookmark), or a partial hex nodeid. This means that
e.g. repo[<hex nodeid>] will now fail even if a bookmark with the same
name exists (which is a good thing IMO). It also means that doing
repo[<non-existent node>] no longer ends up loading namespaces (which
was a surprising side-effect of creating of failing to create a
context object that I recently ran into while debugging something
unrelated to this series).

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

Diff 8475

mercurial/context.py

bin, bin,
hex, hex,
modifiednodeid, modifiednodeid,
nullid, nullid,
nullrev, nullrev,
short, short,
wdirfilenodeids, wdirfilenodeids,
wdirid, wdirid,
wdirrev,
) )
from . import ( from . import (
dagop, dagop,
encoding, encoding,
error, error,
fileset, fileset,
match as matchmod, match as matchmod,
obsolete as obsmod, obsolete as obsmod,
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 changectxdeprecwarn(repo):
# changectx's constructor will soon lose support for these forms of
# changeids:
# * stringinfied ints
# * bookmarks, tags, branches, and other namespace identifiers
# * hex nodeid prefixes
#
# Depending on your use case, replace repo[x] by one of these:
# * If you want to support general revsets, use scmutil.revsingle(x)
# * If you know that "x" is a stringified int, use repo[int(x)]
# * If you know that "x" is a bookmark, use repo._bookmarks.changectx(x)
# * If you know that "x" is a tag, use repo[repo.tags()[x]]
# * If you know that "x" is a branch or in some other namespace,
# use the appropriate mechanism for that namespace
# * If you know that "x" is a hex nodeid prefix, use
# repo[scmutil.resolvehexnodeidprefix(repo, x)]
# * If "x" is a string that can be any of the above, but you don't want
# to allow general revsets (perhaps because "x" may come from a remote
# user and the revset may be too costly), use scmutil.revsymbol(repo, x)
# * If "x" can be a mix of the above, you'll have to figure it out
# yourself
repo.ui.deprecwarn("changectx.__init__ is getting more limited, see "
"context.changectxdeprecwarn() for details", "4.6",
stacklevel=4)
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)
self._node = changeid self._node = changeid
self._rev = repo.changelog.rev(changeid) self._rev = repo.changelog.rev(changeid)
return return
except error.FilteredLookupError: except error.FilteredLookupError:
raise raise
except LookupError: except LookupError:
pass pass
try:
r = int(changeid)
if '%d' % r != changeid:
raise ValueError
l = len(repo.changelog)
if r < 0:
r += l
if r < 0 or r >= l and r != wdirrev:
raise ValueError
self._rev = r
self._node = repo.changelog.node(r)
changectxdeprecwarn(repo)
return
except error.FilteredIndexError:
raise
except (ValueError, OverflowError, IndexError):
pass
if len(changeid) == 40: if len(changeid) == 40:
try: try:
self._node = bin(changeid) self._node = bin(changeid)
self._rev = repo.changelog.rev(self._node) self._rev = repo.changelog.rev(self._node)
return return
except error.FilteredLookupError: except error.FilteredLookupError:
raise raise
except (TypeError, LookupError): except (TypeError, LookupError):
pass pass
# lookup bookmarks through the name interface
try:
self._node = repo.names.singlenode(repo, changeid)
self._rev = repo.changelog.rev(self._node)
changectxdeprecwarn(repo)
return
except KeyError:
pass
self._node = scmutil.resolvehexnodeidprefix(repo, changeid)
if self._node is not None:
self._rev = repo.changelog.rev(self._node)
changectxdeprecwarn(repo)
return
# lookup failed # lookup failed
# check if it might have come from damaged dirstate # check if it might have come from damaged dirstate
# #
# XXX we could avoid the unfiltered if we had a recognizable # XXX we could avoid the unfiltered if we had a recognizable
# exception for filtered changeset access # exception for filtered changeset access
if (repo.local() if (repo.local()
and changeid in repo.unfiltered().dirstate.parents()): and changeid in repo.unfiltered().dirstate.parents()):
msg = _("working directory has unknown parent '%s'!") msg = _("working directory has unknown parent '%s'!")