# HG changeset patch # User Pierre-Yves David <pierre-yves.david@octobus.net> # Date 1513253996 -3600 # Thu Dec 14 13:19:56 2017 +0100 # Branch stable # Node ID 64aedeb306257d6a27cd12e1ea0c3ba8970ff3d4 # Parent d7dc6633bba1e751d7de0752b6d4a3ebe3f8a8af topic: fix compatibility with 4.3 A compatibility fixes ended up being overlooked, we are bringing it back into the main branch. diff --git a/CHANGELOG b/CHANGELOG --- a/CHANGELOG +++ b/CHANGELOG @@ -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 ------------------- diff --git a/hgext3rd/topic/__init__.py b/hgext3rd/topic/__init__.py --- a/hgext3rd/topic/__init__.py +++ b/hgext3rd/topic/__init__.py @@ -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):