( )⚙ D4827 context: move logic from changectx.__init__ to localrepo.__getitem__ (API)

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4827

context: move logic from changectx.__init__ to localrepo.__getitem__ (API)
ClosedPublic

Authored by martinvonz on Oct 1 2018, 6:23 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG3d35304bd09b: context: move logic from changectx.__init__ to localrepo.__getitem__ (API)
rHGa669ad5d3db2: context: move logic from changectx.__init__ to localrepo.__getitem__ (API)
Summary

My motivation for this change was to make repo[node] not load the
dirstate (more about that in the next patch), but I think it makes
more sense this way too. For example, raising RepoLookupError seems to
belong better in the repo lookup function
(i.e. localrepo.getitem).

This makes the changectx constructor very simple -- it just assigns
the given repo, revnum, and nodeid to properties.

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 (66 lines)
Mmercurial/localrepo.py (62 lines)

Diff 11556

mercurial/context.py

import errno import errno
import filecmp import filecmp
import os import os
import stat import stat
from .i18n import _ from .i18n import _
from .node import ( from .node import (
addednodeid, addednodeid,
bin,
hex, hex,
modifiednodeid, modifiednodeid,
nullid, nullid,
nullrev, nullrev,
short, short,
wdirfilenodeids, wdirfilenodeids,
wdirid, wdirid,
) )
l.sort() l.sort()
return r return r
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, rev, node):
"""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._rev = rev
try: self._node = node
if isinstance(changeid, int):
self._node = repo.changelog.node(changeid)
self._rev = changeid
return
elif changeid == 'null':
self._node = nullid
self._rev = nullrev
return
elif changeid == 'tip':
self._node = repo.changelog.tip()
self._rev = repo.changelog.rev(self._node)
return
elif (changeid == '.'
or repo.local() and changeid == repo.dirstate.p1()):
# this is a hack to delay/avoid loading obsmarkers
# when we know that '.' won't be hidden
self._node = repo.dirstate.p1()
self._rev = repo.unfiltered().changelog.rev(self._node)
return
elif len(changeid) == 20:
try:
self._node = changeid
self._rev = repo.changelog.rev(changeid)
return
except error.FilteredLookupError:
changeid = hex(changeid) # for the error message
raise
except LookupError:
# check if it might have come from damaged dirstate
#
# XXX we could avoid the unfiltered if we had a recognizable
# exception for filtered changeset access
if (repo.local()
and changeid in repo.unfiltered().dirstate.parents()):
msg = _("working directory has unknown parent '%s'!")
raise error.Abort(msg % short(changeid))
changeid = hex(changeid) # for the error message
elif len(changeid) == 40:
try:
self._node = bin(changeid)
self._rev = repo.changelog.rev(self._node)
return
except error.FilteredLookupError:
raise
except LookupError:
pass
else:
raise error.ProgrammingError(
"unsupported changeid '%s' of type %s" %
(changeid, type(changeid)))
except (error.FilteredIndexError, error.FilteredLookupError):
raise error.FilteredRepoLookupError(_("filtered revision '%s'")
% pycompat.bytestr(changeid))
except IndexError:
pass
raise error.RepoLookupError(
_("unknown revision '%s'") % changeid)
def __hash__(self): def __hash__(self):
try: try:
return hash(self._rev) return hash(self._rev)
except AttributeError: except AttributeError:
return id(self) return id(self)
def __nonzero__(self): def __nonzero__(self):

mercurial/localrepo.py

import os import os
import random import random
import sys import sys
import time import time
import weakref import weakref
from .i18n import _ from .i18n import _
from .node import ( from .node import (
bin,
hex, hex,
nullid, nullid,
nullrev,
short, short,
) )
from . import ( from . import (
bookmarks, bookmarks,
branchmap, branchmap,
bundle2, bundle2,
changegroup, changegroup,
changelog, changelog,
if isinstance(changeid, context.basectx): if isinstance(changeid, context.basectx):
return changeid return changeid
if isinstance(changeid, slice): if isinstance(changeid, slice):
# wdirrev isn't contiguous so the slice shouldn't include it # wdirrev isn't contiguous so the slice shouldn't include it
return [self[i] return [self[i]
for i in pycompat.xrange(*changeid.indices(len(self))) for i in pycompat.xrange(*changeid.indices(len(self)))
if i not in self.changelog.filteredrevs] if i not in self.changelog.filteredrevs]
try: try:
return context.changectx(self, changeid) if isinstance(changeid, int):
node = self.changelog.node(changeid)
rev = changeid
return context.changectx(self, rev, node)
elif changeid == 'null':
node = nullid
rev = nullrev
return context.changectx(self, rev, node)
elif changeid == 'tip':
node = self.changelog.tip()
rev = self.changelog.rev(node)
return context.changectx(self, rev, node)
elif (changeid == '.'
or self.local() and changeid == self.dirstate.p1()):
# this is a hack to delay/avoid loading obsmarkers
# when we know that '.' won't be hidden
node = self.dirstate.p1()
rev = self.unfiltered().changelog.rev(node)
return context.changectx(self, rev, node)
elif len(changeid) == 20:
try:
node = changeid
rev = self.changelog.rev(changeid)
return context.changectx(self, rev, node)
except error.FilteredLookupError:
changeid = hex(changeid) # for the error message
raise
except LookupError:
# check if it might have come from damaged dirstate
#
# XXX we could avoid the unfiltered if we had a recognizable
# exception for filtered changeset access
if (self.local()
and changeid in self.unfiltered().dirstate.parents()):
msg = _("working directory has unknown parent '%s'!")
raise error.Abort(msg % short(changeid))
changeid = hex(changeid) # for the error message
elif len(changeid) == 40:
try:
node = bin(changeid)
rev = self.changelog.rev(node)
return context.changectx(self, rev, node)
except error.FilteredLookupError:
raise
except LookupError:
pass
else:
raise error.ProgrammingError(
"unsupported changeid '%s' of type %s" %
(changeid, type(changeid)))
except (error.FilteredIndexError, error.FilteredLookupError):
raise error.FilteredRepoLookupError(_("filtered revision '%s'")
% pycompat.bytestr(changeid))
except IndexError:
pass
except error.WdirUnsupported: except error.WdirUnsupported:
return context.workingctx(self) return context.workingctx(self)
raise error.RepoLookupError(
_("unknown revision '%s'") % changeid)
def __contains__(self, changeid): def __contains__(self, changeid):
"""True if the given changeid exists """True if the given changeid exists
error.AmbiguousPrefixLookupError is raised if an ambiguous node error.AmbiguousPrefixLookupError is raised if an ambiguous node
specified. specified.
""" """
try: try: