# HG changeset patch # User Pierre-Yves David # Date 1508847237 -7200 # Node ID 6f10c94a211499e97e551fa6170a50942889cf77 # Parent f7f8fcbed02cbacd77d32db7157fe172b0ef49d7 compat: stop working around 3.8 file cache limitation We no longer support this version. diff -r f7f8fcbed02c -r 6f10c94a2114 hgext3rd/evolve/obscache.py --- 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') diff -r f7f8fcbed02c -r 6f10c94a2114 hgext3rd/evolve/obsdiscovery.py --- 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