Mercurial > evolve
changeset 3144:6f10c94a2114
compat: stop working around 3.8 file cache limitation
We no longer support this version.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 24 Oct 2017 14:13:57 +0200 |
| parents | f7f8fcbed02c |
| children | ca6650879726 |
| files | hgext3rd/evolve/obscache.py hgext3rd/evolve/obsdiscovery.py |
| diffstat | 2 files changed, 2 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/obscache.py Tue Oct 24 14:13:23 2017 +0200 +++ b/hgext3rd/evolve/obscache.py Tue Oct 24 14:13:57 2017 +0200 @@ -49,15 +49,7 @@ except ImportError: from mercurial import scmutil as vfsmod -try: - obsstorefilecache = localrepo.localrepository.obsstore -except AttributeError: - # XXX hg-3.8 compat - # - # mercurial 3.8 has issue with accessing file cache property from their - # cache. This is fix by 36fbd72c2f39fef8ad52d7c559906c2bc388760c in core - # and shipped in 3.9 - obsstorefilecache = localrepo.localrepository.__dict__['obsstore'] +obsstorefilecache = localrepo.localrepository.obsstore # obsstore is a filecache so we have do to some spacial dancing @eh.wrapfunction(obsstorefilecache, 'func')
--- a/hgext3rd/evolve/obsdiscovery.py Tue Oct 24 14:13:23 2017 +0200 +++ b/hgext3rd/evolve/obsdiscovery.py Tue Oct 24 14:13:57 2017 +0200 @@ -557,15 +557,7 @@ obsstore.rangeobshashcache.clear() return orig(obsstore, *args, **kwargs) -try: - obsstorefilecache = localrepo.localrepository.obsstore -except AttributeError: - # XXX hg-3.8 compat - # - # mercurial 3.8 has issue with accessing file cache property from their - # cache. This is fix by 36fbd72c2f39fef8ad52d7c559906c2bc388760c in core - # and shipped in 3.9 - obsstorefilecache = localrepo.localrepository.__dict__['obsstore'] +obsstorefilecache = localrepo.localrepository.obsstore # obsstore is a filecache so we have do to some spacial dancing