# HG changeset patch # User Pierre-Yves David # Date 1534458430 -7200 # Node ID 42efc12b3d108f39cad49d0a6851347f58c45130 # Parent 926c8e2f5400e1d8338ded238eda390ae174ab0c obshashrange: re-enabled more selective pruning of affected range diff -r 926c8e2f5400 -r 42efc12b3d10 hgext3rd/evolve/obsdiscovery.py --- a/hgext3rd/evolve/obsdiscovery.py Fri Aug 17 00:23:20 2018 +0200 +++ b/hgext3rd/evolve/obsdiscovery.py Fri Aug 17 00:27:10 2018 +0200 @@ -473,7 +473,7 @@ if con is not None: # always reset for now, the code detecting affect is buggy # so we need to reset more broadly than we would like. - if True or repo.stablerange._con is None: + if repo.stablerange._con is None: con.execute(_reset) else: ranges = repo.stablerange.contains(repo, affected) diff -r 926c8e2f5400 -r 42efc12b3d10 tests/test-discovery-obshashrange.t --- a/tests/test-discovery-obshashrange.t Fri Aug 17 00:23:20 2018 +0200 +++ b/tests/test-discovery-obshashrange.t Fri Aug 17 00:27:10 2018 +0200 @@ -447,6 +447,7 @@ * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obscache in *.???? seconds (0r, 1o) (glob) * @0000000000000000000000000000000000000000 (*)> -R ../server debugobsolete bbbbbbb2222222222bbbbbbbbbbbbb2222222222 bebd167eb94d257ace0e814aeb98e6972ed2970d exited 0 after *.?? seconds (glob) * @0000000000000000000000000000000000000000 (*)> -R server serve --stdio (glob) + 1970/01/01 00:00:00 * @0000000000000000000000000000000000000000 (*)> obshashcache clean - new markers affect 2 changeset and cached ranges (glob) * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obshashrange in *.???? seconds (0r, 2o) (glob) * @0000000000000000000000000000000000000000 (*)> -R server serve --stdio exited 0 after *.?? seconds (glob) * @0000000000000000000000000000000000000000 (*)> -R ../server blackbox (glob)