changeset 3959:42efc12b3d10 stable

obshashrange: re-enabled more selective pruning of affected range
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 17 Aug 2018 00:27:10 +0200
parents 926c8e2f5400
children ce50e788d88c
files hgext3rd/evolve/obsdiscovery.py tests/test-discovery-obshashrange.t
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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)
--- 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)