This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4826

context: reduce dependence of changectx constructor
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGe1e3d1b498d3: context: reduce dependence of changectx constructor
rHG8f59cee8e80c: context: reduce dependence of changectx constructor
Summary

I want to change the constructor's signature and letting all creation
of changectx instances go through the repo simplifies that.

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

Diff 11555

mercurial/context.py

def p1(self): def p1(self):
return self._parents[0] return self._parents[0]
def p2(self): def p2(self):
parents = self._parents parents = self._parents
if len(parents) == 2: if len(parents) == 2:
return parents[1] return parents[1]
return changectx(self._repo, nullrev) return self._repo[nullrev]
def _fileinfo(self, path): def _fileinfo(self, path):
if r'_manifest' in self.__dict__: if r'_manifest' in self.__dict__:
try: try:
return self._manifest[path], self._manifest.flags(path) return self._manifest[path], self._manifest.flags(path)
except KeyError: except KeyError:
raise error.ManifestLookupError(self._node, path, raise error.ManifestLookupError(self._node, path,
_('not found in manifest')) _('not found in manifest'))
def _manifestdelta(self): def _manifestdelta(self):
return self._manifestctx.readdelta() return self._manifestctx.readdelta()
@propertycache @propertycache
def _parents(self): def _parents(self):
repo = self._repo repo = self._repo
p1, p2 = repo.changelog.parentrevs(self._rev) p1, p2 = repo.changelog.parentrevs(self._rev)
if p2 == nullrev: if p2 == nullrev:
return [changectx(repo, p1)] return [repo[p1]]
return [changectx(repo, p1), changectx(repo, p2)] return [repo[p1], repo[p2]]
def changeset(self): def changeset(self):
c = self._changeset c = self._changeset
return ( return (
c.manifest, c.manifest,
c.user, c.user,
c.date, c.date,
c.files, c.files,
def children(self): def children(self):
"""return list of changectx contexts for each child changeset. """return list of changectx contexts for each child changeset.
This returns only the immediate child changesets. Use descendants() to This returns only the immediate child changesets. Use descendants() to
recursively walk children. recursively walk children.
""" """
c = self._repo.changelog.children(self._node) c = self._repo.changelog.children(self._node)
return [changectx(self._repo, x) for x in c] return [self._repo[x] for x in c]
def ancestors(self): def ancestors(self):
for a in self._repo.changelog.ancestors([self._rev]): for a in self._repo.changelog.ancestors([self._rev]):
yield changectx(self._repo, a) yield self._repo[a]
def descendants(self): def descendants(self):
"""Recursively yield all children of the changeset. """Recursively yield all children of the changeset.
For just the immediate children, use children() For just the immediate children, use children()
""" """
for d in self._repo.changelog.descendants([self._rev]): for d in self._repo.changelog.descendants([self._rev]):
yield changectx(self._repo, d) yield self._repo[d]
def filectx(self, path, fileid=None, filelog=None): def filectx(self, path, fileid=None, filelog=None):
"""get a file context from this changeset""" """get a file context from this changeset"""
if fileid is None: if fileid is None:
fileid = self.filenode(path) fileid = self.filenode(path)
return filectx(self._repo, path, fileid=fileid, return filectx(self._repo, path, fileid=fileid,
changectx=self, filelog=filelog) changectx=self, filelog=filelog)
anc = self._repo.changelog.ancestor(self._node, n2) anc = self._repo.changelog.ancestor(self._node, n2)
if warn: if warn:
self._repo.ui.status( self._repo.ui.status(
(_("note: using %s as ancestor of %s and %s\n") % (_("note: using %s as ancestor of %s and %s\n") %
(short(anc), short(self._node), short(n2))) + (short(anc), short(self._node), short(n2))) +
''.join(_(" alternatively, use --config " ''.join(_(" alternatively, use --config "
"merge.preferancestor=%s\n") % "merge.preferancestor=%s\n") %
short(n) for n in sorted(cahs) if n != anc)) short(n) for n in sorted(cahs) if n != anc))
return changectx(self._repo, anc) return self._repo[anc]
def isancestorof(self, other): def isancestorof(self, other):
"""True if this changeset is an ancestor of other""" """True if this changeset is an ancestor of other"""
return self._repo.changelog.isancestorrev(self._rev, other._rev) return self._repo.changelog.isancestorrev(self._rev, other._rev)
def walk(self, match): def walk(self, match):
'''Generates matching file names.''' '''Generates matching file names.'''
if changectx is not None: if changectx is not None:
self._changectx = changectx self._changectx = changectx
if fileid is not None: if fileid is not None:
self._fileid = fileid self._fileid = fileid
@propertycache @propertycache
def _changectx(self): def _changectx(self):
try: try:
return changectx(self._repo, self._changeid) return self._repo[self._changeid]
except error.FilteredRepoLookupError: except error.FilteredRepoLookupError:
# Linkrev may point to any revision in the repository. When the # Linkrev may point to any revision in the repository. When the
# repository is filtered this may lead to `filectx` trying to build # repository is filtered this may lead to `filectx` trying to build
# `changectx` for filtered revision. In such case we fallback to # `changectx` for filtered revision. In such case we fallback to
# creating `changectx` on the unfiltered version of the reposition. # creating `changectx` on the unfiltered version of the reposition.
# This fallback should not be an issue because `changectx` from # This fallback should not be an issue because `changectx` from
# `filectx` are not used in complex operations that care about # `filectx` are not used in complex operations that care about
# filtering. # filtering.
# #
# This fallback is a cheap and dirty fix that prevent several # This fallback is a cheap and dirty fix that prevent several
# crashes. It does not ensure the behavior is correct. However the # crashes. It does not ensure the behavior is correct. However the
# behavior was not correct before filtering either and "incorrect # behavior was not correct before filtering either and "incorrect
# behavior" is seen as better as "crash" # behavior" is seen as better as "crash"
# #
# Linkrevs have several serious troubles with filtering that are # Linkrevs have several serious troubles with filtering that are
# complicated to solve. Proper handling of the issue here should be # complicated to solve. Proper handling of the issue here should be
# considered when solving linkrev issue are on the table. # considered when solving linkrev issue are on the table.
return changectx(self._repo.unfiltered(), self._changeid) return self._repo.unfiltered()[self._changeid]
def filectx(self, fileid, changeid=None): def filectx(self, fileid, changeid=None):
'''opens an arbitrary revision of the file without '''opens an arbitrary revision of the file without
opening a new filelog''' opening a new filelog'''
return filectx(self._repo, self._path, fileid=fileid, return filectx(self._repo, self._path, fileid=fileid,
filelog=self._filelog, changeid=changeid) filelog=self._filelog, changeid=changeid)
def rawdata(self): def rawdata(self):
ds = self._repo.dirstate ds = self._repo.dirstate
return sorted(f for f in ds.matches(match) if ds[f] != 'r') return sorted(f for f in ds.matches(match) if ds[f] != 'r')
def ancestors(self): def ancestors(self):
for p in self._parents: for p in self._parents:
yield p yield p
for a in self._repo.changelog.ancestors( for a in self._repo.changelog.ancestors(
[p.rev() for p in self._parents]): [p.rev() for p in self._parents]):
yield changectx(self._repo, a) yield self._repo[a]
def markcommitted(self, node): def markcommitted(self, node):
"""Perform post-commit cleanup necessary after committing this ctx """Perform post-commit cleanup necessary after committing this ctx
Specifically, this updates backing stores this working context Specifically, this updates backing stores this working context
wraps to reflect the fact that the changes reflected by this wraps to reflect the fact that the changes reflected by this
workingctx have been committed. For example, it marks workingctx have been committed. For example, it marks
modified and added files as normal in the dirstate. modified and added files as normal in the dirstate.
def hex(self): def hex(self):
return hex(wdirid) return hex(wdirid)
@propertycache @propertycache
def _parents(self): def _parents(self):
p = self._repo.dirstate.parents() p = self._repo.dirstate.parents()
if p[1] == nullid: if p[1] == nullid:
p = p[:-1] p = p[:-1]
return [changectx(self._repo, x) for x in p] return [self._repo[x] for x in p]
def _fileinfo(self, path): def _fileinfo(self, path):
# populate __dict__['_manifest'] as workingctx has no _manifestdelta # populate __dict__['_manifest'] as workingctx has no _manifestdelta
self._manifest self._manifest
return super(workingctx, self)._fileinfo(path) return super(workingctx, self)._fileinfo(path)
def filectx(self, path, filelog=None): def filectx(self, path, filelog=None):
"""get a file context from the working directory""" """get a file context from the working directory"""

mercurial/localrepo.py

def __getitem__(self, changeid): def __getitem__(self, changeid):
if changeid is None: if changeid is None:
return context.workingctx(self) return context.workingctx(self)
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 [context.changectx(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) return context.changectx(self, changeid)
except error.WdirUnsupported: except error.WdirUnsupported:
return context.workingctx(self) return context.workingctx(self)
def __contains__(self, changeid): def __contains__(self, changeid):