# HG changeset patch # User Pierre-Yves David # Date 1495016756 -7200 # Node ID 8dd4de460b64dcebc65616d24e42c27cea636175 # Parent 385156ab55b8d147b736b6d07a77965adb2e1224 obshashcache: invalidate affected cache entries on side Calling reset during upgrade is screwing up the cache key update. diff -r 385156ab55b8 -r 8dd4de460b64 hgext3rd/evolve/obsdiscovery.py --- a/hgext3rd/evolve/obsdiscovery.py Wed May 17 12:26:15 2017 +0200 +++ b/hgext3rd/evolve/obsdiscovery.py Wed May 17 12:25:56 2017 +0200 @@ -434,10 +434,6 @@ def clear(self, reset=False): self._valid = False - if reset: - con = self._con - if con is not None: - con.execute(_reset) super(_obshashcache, self).clear(reset=reset) self._data.clear() self._new.clear() @@ -491,9 +487,11 @@ for p in l: r = rev(p) if r is not None and r not in setrevs: - repo.ui.log('evoext-cache', ' obshashcache reset - ' + repo.ui.log('evoext-cache', 'obshashcache reset - ' 'new markers affect cached ranges\n') - self.clear(reset=True) + con = self._con + if con is not None: + con.execute(_reset) break else: continue