diff hgext3rd/topic/__init__.py @ 3287:4303a46b4167 mercurial-4.3

test-compat: merge stable into mercurial-4.3
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 11 Dec 2017 16:32:03 +0100
parents 703e8398ac57
children 62f742d144da
line wrap: on
line diff
--- a/hgext3rd/topic/__init__.py	Mon Dec 11 16:12:38 2017 +0100
+++ b/hgext3rd/topic/__init__.py	Mon Dec 11 16:32:03 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):