Mercurial > evolve
changeset 3297:4d7e002a2bb5
branching: merge stable into default
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Sat, 16 Dec 2017 23:52:32 +0100 |
| parents | b834cb64f779 (diff) 57aedd4c39a0 (current diff) |
| children | f4b06f44d274 |
| files | hgext3rd/topic/__init__.py |
| diffstat | 4 files changed, 13 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/CHANGELOG Tue Dec 12 04:18:17 2017 +0100 +++ b/CHANGELOG Sat Dec 16 23:52:32 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/evolve/cmdrewrite.py Tue Dec 12 04:18:17 2017 +0100 +++ b/hgext3rd/evolve/cmdrewrite.py Sat Dec 16 23:52:32 2017 +0100 @@ -108,7 +108,7 @@ If you don't specify -m, the parent's message will be reused. - If --extra is specified, the behavior of `hg amend` is reversed: Changes + If --extract is specified, the behavior of `hg amend` is reversed: Changes to selected files in the checked out revision appear again as uncommitted changed in the working directory.
--- a/hgext3rd/topic/__init__.py Tue Dec 12 04:18:17 2017 +0100 +++ b/hgext3rd/topic/__init__.py Sat Dec 16 23:52:32 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):
--- a/tests/test-amend.t Tue Dec 12 04:18:17 2017 +0100 +++ b/tests/test-amend.t Sat Dec 16 23:52:32 2017 +0100 @@ -136,7 +136,7 @@ If you don't specify -m, the parent's message will be reused. - If --extra is specified, the behavior of 'hg amend' is reversed: Changes + If --extract is specified, the behavior of 'hg amend' is reversed: Changes to selected files in the checked out revision appear again as uncommitted changed in the working directory.