merge with stable
authorPierre-Yves David <pierre-yves.david@octobus.net>
Thu, 04 May 2017 21:24:02 +0200
changeset 2332 77c184c80e3e
parent 2330 d72c8c1f09e2 (current diff)
parent 2331 d49f376598f8 (diff)
child 2333 adf114c767ab
merge with stable
--- a/README	Thu May 04 14:02:30 2017 +0200
+++ b/README	Thu May 04 21:24:02 2017 +0200
@@ -112,6 +112,11 @@
 Changelog
 =========
 
+6.1.1 - in progress
+-------------------
+
+ - also enable the new cache (from 6.1.0) for 'evolve.server-only',
+
 6.1.0 -- 2017-05-03
 -------------------
 
--- a/hgext3rd/evolve/serveronly.py	Thu May 04 14:02:30 2017 +0200
+++ b/hgext3rd/evolve/serveronly.py	Thu May 04 21:24:02 2017 +0200
@@ -17,6 +17,7 @@
     from . import (
         exthelper,
         metadata,
+        obscache,
         obsexchange,
     )
 except ValueError as exc:
@@ -27,6 +28,7 @@
     from evolve import (
         exthelper,
         metadata,
+        obscache,
         obsexchange,
     )
 
@@ -36,6 +38,7 @@
 buglink = metadata.buglink
 
 eh = exthelper.exthelper()
+eh.merge(obscache.eh)
 eh.merge(obsexchange.eh)
 uisetup = eh.final_uisetup
 extsetup = eh.final_extsetup