( )⚙ D4828 repo: move unfiltered-repo optimization to workingctx

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4828

repo: move unfiltered-repo optimization to workingctx
ClosedPublic

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

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG43d3b09b3e5a: repo: move unfiltered-repo optimization to workingctx
rHG3c4d9edfb777: repo: move unfiltered-repo optimization to workingctx
Summary

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.

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.

Event Timeline

martinvonz created this revision.Oct 1 2018, 6:23 PM
Closed by commit rHG3c4d9edfb777: repo: move unfiltered-repo optimization to workingctx (authored by martinvonz). · Explain WhyOct 2 2018, 8:46 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 11558

mercurial/context.py

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 [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): 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

elif changeid == 'null': elif changeid == 'null':
node = nullid node = nullid
rev = nullrev rev = nullrev
return context.changectx(self, rev, node) return context.changectx(self, rev, node)
elif changeid == 'tip': elif changeid == 'tip':
node = self.changelog.tip() node = self.changelog.tip()
rev = self.changelog.rev(node) rev = self.changelog.rev(node)
return context.changectx(self, rev, node) return context.changectx(self, rev, node)
elif (changeid == '.' elif changeid == '.':
or self.local() and changeid == self.dirstate.p1()):
# this is a hack to delay/avoid loading obsmarkers # this is a hack to delay/avoid loading obsmarkers
# when we know that '.' won't be hidden # when we know that '.' won't be hidden
node = self.dirstate.p1() node = self.dirstate.p1()
rev = self.unfiltered().changelog.rev(node) rev = self.unfiltered().changelog.rev(node)
return context.changectx(self, rev, node) return context.changectx(self, rev, node)
elif len(changeid) == 20: elif len(changeid) == 20:
try: try:
node = changeid node = changeid

tests/test-histedit-obsolete.t

[1] [1]
$ hg st $ hg st
A b A b
A d A d
? plan ? plan
$ hg commit --amend -X . -m XXXXXX $ hg commit --amend -X . -m XXXXXX
$ hg commit --amend -X . -m b2 $ hg commit --amend -X . -m b2
$ hg --hidden --config extensions.strip= strip 'desc(XXXXXX)' --no-backup $ hg --hidden --config extensions.strip= strip 'desc(XXXXXX)' --no-backup
warning: ignoring unknown working parent aba7da937030!
$ hg histedit --continue $ hg histedit --continue
$ hg log -G $ hg log -G
@ 8:273c1f3b8626 c @ 8:273c1f3b8626 c
| |
o 7:aba7da937030 b2 o 7:aba7da937030 b2
| |
o 0:cb9a9f314b8b a o 0:cb9a9f314b8b a

tests/test-single-head.t

date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: ROOT summary: ROOT
actual stripping actual stripping
$ hg strip --config extensions.strip= --rev 'desc("c_dH0")' $ hg strip --config extensions.strip= --rev 'desc("c_dH0")'
saved backup bundle to $TESTTMP/client/.hg/strip-backup/fe47ea669cea-a41bf5a9-backup.hg saved backup bundle to $TESTTMP/client/.hg/strip-backup/fe47ea669cea-a41bf5a9-backup.hg
warning: ignoring unknown working parent 49003e504178!