This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1244

overlayworkingctx: invalidate the manifest cache when changing parents
ClosedPublic

Authored by phillco on Oct 26 2017, 12:48 AM.

Details

Reviewers
durin42
dlax
Group Reviewers
hg-reviewers
Commits
rHG777cb4497d8d: overlayworkingctx: invalidate the manifest cache when changing parents
Summary

This fixes problems noticeable when rebasing several commits into one
destination commit using `--collapse`. The manifest cache needs to be cleared
each time.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

phillco updated this revision to Diff 4190.Dec 7 2017, 4:22 PM
phillco updated this revision to Diff 4209.Dec 7 2017, 4:44 PM
phillco updated this revision to Diff 4217.Dec 7 2017, 4:52 PM
durin42 accepted this revision.Dec 7 2017, 4:57 PM
This revision is now accepted and ready to land.Dec 7 2017, 4:57 PM
phillco updated this revision to Diff 4236.Dec 8 2017, 1:38 AM
dlax added a subscriber: dlax.Dec 8 2017, 4:23 AM
dlax added inline comments.
mercurial/context.py
2003

Wouldn't util.clearcachedproperty(self, '_manifest') work?

dlax requested changes to this revision.Dec 8 2017, 4:23 AM
This revision now requires changes to proceed.Dec 8 2017, 4:23 AM
phillco added inline comments.Dec 8 2017, 2:58 PM
mercurial/context.py
2003

Thanks! I did not know about it -- will use.

phillco updated this revision to Diff 4258.Dec 8 2017, 3:00 PM
phillco marked 2 inline comments as done.Dec 8 2017, 3:05 PM
durin42 accepted this revision.Dec 8 2017, 3:34 PM
Closed by commit rHG777cb4497d8d: overlayworkingctx: invalidate the manifest cache when changing parents (authored by phillco). · Explain WhyDec 8 2017, 3:39 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (9 lines)

Diff 4209

mercurial/context.py

def __init__(self, repo): def __init__(self, repo):
super(overlayworkingctx, self).__init__(repo) super(overlayworkingctx, self).__init__(repo)
self._repo = repo self._repo = repo
self.clean() self.clean()
def setbase(self, wrappedctx): def setbase(self, wrappedctx):
self._wrappedctx = wrappedctx self._wrappedctx = wrappedctx
self._parents = [wrappedctx] self._parents = [wrappedctx]
# Drop old manifest cache:
self._invalidate()
dlaxUnsubmitted
Done

Wouldn't util.clearcachedproperty(self, '_manifest') work?

dlax: Wouldn't `util.clearcachedproperty(self, '_manifest')` work?
phillcoAuthorUnsubmitted
Done

Thanks! I did not know about it -- will use.

phillco: Thanks! I did not know about it -- will use.
def data(self, path): def data(self, path):
if self.isdirty(path): if self.isdirty(path):
if self._cache[path]['exists']: if self._cache[path]['exists']:
if self._cache[path]['data']: if self._cache[path]['data']:
return self._cache[path]['data'] return self._cache[path]['data']
else: else:
# Must fallback here, too, because we only set flags. # Must fallback here, too, because we only set flags.
return self._wrappedctx[path].data() return self._wrappedctx[path].data()
else: else:
raise error.ProgrammingError("No such file or directory: %s" % raise error.ProgrammingError("No such file or directory: %s" %
path) path)
else: else:
return self._wrappedctx[path].data() return self._wrappedctx[path].data()
def _invalidate(self):
# Unfortunately, this is necessary when rebasing several nodes with one
# ``overlayworkingctx`` (e.g. with --collapse); the manifest can change
# and make the cache outdated.
self._manifest = None
del self.__dict__["_manifest"]
@propertycache @propertycache
def _manifest(self): def _manifest(self):
parents = self.parents() parents = self.parents()
man = parents[0].manifest().copy() man = parents[0].manifest().copy()
flag = self._flagfunc flag = self._flagfunc
for path in self.added(): for path in self.added():
man[path] = addednodeid man[path] = addednodeid