changeset 3295:64aedeb30625 stable

topic: fix compatibility with 4.3 A compatibility fixes ended up being overlooked, we are bringing it back into the main branch.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 14 Dec 2017 13:19:56 +0100
parents d7dc6633bba1
children b834cb64f779 62f742d144da
files CHANGELOG hgext3rd/topic/__init__.py
diffstat 2 files changed, 11 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/CHANGELOG	Tue Dec 12 04:16:54 2017 +0100
+++ b/CHANGELOG	Thu Dec 14 13:19:56 2017 +0100
@@ -1,6 +1,13 @@
 Changelog
 =========
 
+7.1.1 - in progress
+-------------------
+
+topic (0.6.1)
+
+  * fix compatibility with Mercurial-4.3
+
 7.1.0 -- 2017-12-12
 -------------------
 
--- a/hgext3rd/topic/__init__.py	Tue Dec 12 04:16:54 2017 +0100
+++ b/hgext3rd/topic/__init__.py	Thu Dec 14 13:19:56 2017 +0100
@@ -181,6 +181,9 @@
 buglink = 'https://bz.mercurial-scm.org/'
 
 if util.safehasattr(registrar, 'configitem'):
+
+    from mercurial import configitems
+
     configtable = {}
     configitem = registrar.configitem(configtable)
 
@@ -200,7 +203,7 @@
                default=False,
     )
     configitem('experimental', 'topic-mode.server',
-               default=configitem.dynamicdefault,
+               default=configitems.dynamicdefault,
     )
 
     def extsetup(ui):