Mercurial > hg-stable
diff mercurial/context.py @ 39960:43d3b09b3e5a
repo: move unfiltered-repo optimization to workingctx
localrepo.__getitem__ special-cased lookup of the working copy parent
to avoid looking up obsmarkers. I think the reason for that code
(which I once wrote myself) was to make `hg commit` not load
obsmarkers, which it would otherwise do via ctx.p1() in
localrepo.commitctx().
That had the somewhat unfortunate consequence of making lookup of an
unrelated binary nodeid load the dirstate. Now that changectx's
constructor is dumb, we can let workingctx._parents() have the
opmtimization instead.
This affects two tests, because they no longer end up loading the
dirstate and their "warning: ignoring unknown working parent ..."
messages therefore go way.
Differential Revision: https://phab.mercurial-scm.org/D4828
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 26 Sep 2018 23:09:28 -0700 |
parents | 3d35304bd09b |
children | ccf4d808ec4c |
line wrap: on
line diff
--- a/mercurial/context.py Wed Sep 26 22:53:14 2018 -0700 +++ b/mercurial/context.py Wed Sep 26 23:09:28 2018 -0700 @@ -1241,7 +1241,9 @@ p = self._repo.dirstate.parents() if p[1] == nullid: p = p[:-1] - return [self._repo[x] for x in p] + # use unfiltered repo to delay/avoid loading obsmarkers + unfi = self._repo.unfiltered() + return [changectx(self._repo, unfi.changelog.rev(n), n) for n in p] def _fileinfo(self, path): # populate __dict__['_manifest'] as workingctx has no _manifestdelta