branchmap: explicitly warm+write all subsets of the branchmap caches
'full' claims it will warm all of the caches that are known about, but this was
not the case - it did not actually warm the branchmap caches for subsets that we
haven't requested, or for subsets that are still considered "valid". By
explicitly writing them to disk, we can force the subsets for ex: "served" to be
written ("immutable" and "base"), making it cheaper to calculate "served" the
next time it needs to be updated.
Differential Revision: https://phab.mercurial-scm.org/D6710
--- a/mercurial/localrepo.py Wed Jun 12 13:42:52 2019 +0100
+++ b/mercurial/localrepo.py Mon Aug 05 13:31:12 2019 -0700
@@ -2220,6 +2220,16 @@
self.tags()
self.filtered('served').tags()
+ # The `full` arg is documented as updating even the lazily-loaded
+ # caches immediately, so we're forcing a write to cause these caches
+ # to be warmed up even if they haven't explicitly been requested
+ # yet (if they've never been used by hg, they won't ever have been
+ # written, even if they're a subset of another kind of cache that
+ # *has* been used).
+ for filt in repoview.filtertable.keys():
+ filtered = self.filtered(filt)
+ filtered.branchmap().write(filtered)
+
def invalidatecaches(self):
if r'_tagscache' in vars(self):
--- a/tests/test-debugcommands.t Wed Jun 12 13:42:52 2019 +0100
+++ b/tests/test-debugcommands.t Mon Aug 05 13:31:12 2019 -0700
@@ -546,7 +546,12 @@
.hg/cache/rbc-revs-v1
.hg/cache/rbc-names-v1
.hg/cache/hgtagsfnodes1
+ .hg/cache/branch2-visible-hidden
+ .hg/cache/branch2-visible
+ .hg/cache/branch2-served.hidden
.hg/cache/branch2-served
+ .hg/cache/branch2-immutable
+ .hg/cache/branch2-base
Test debugcolor
--- a/tests/test-server-view.t Wed Jun 12 13:42:52 2019 +0100
+++ b/tests/test-server-view.t Mon Aug 05 13:31:12 2019 -0700
@@ -50,7 +50,12 @@
$ hg -R test --config experimental.extra-filter-revs='not public()' debugupdatecache
$ ls -1 test/.hg/cache/
branch2-base%89c45d2fa07e
+ branch2-immutable%89c45d2fa07e
branch2-served
+ branch2-served%89c45d2fa07e
+ branch2-served.hidden%89c45d2fa07e
+ branch2-visible%89c45d2fa07e
+ branch2-visible-hidden%89c45d2fa07e
hgtagsfnodes1
rbc-names-v1
rbc-revs-v1