# HG changeset patch # User Pierre-Yves David # Date 1583334203 -3600 # Node ID b9af7b8f3eee828826d42b61a4c4fa8012272d6c # Parent 307bb57ff2ce916005394b2e73bc7088eefd77dd compat: drop import compatibility <= 4.5 for `forcebytestr` We no longer support 4.5 diff -r 307bb57ff2ce -r b9af7b8f3eee hgext3rd/evolve/depthcache.py --- a/hgext3rd/evolve/depthcache.py Wed Mar 04 15:21:32 2020 -0800 +++ b/hgext3rd/evolve/depthcache.py Wed Mar 04 16:03:23 2020 +0100 @@ -16,11 +16,7 @@ scmutil, ) -try: - from mercurial.utils.stringutil import forcebytestr -except ImportError: - # hg <= 4.5 (f99d64e8a4e4) - from mercurial.util import forcebytestr +from mercurial.utils.stringutil import forcebytestr from . import ( compat, diff -r 307bb57ff2ce -r b9af7b8f3eee hgext3rd/evolve/firstmergecache.py --- a/hgext3rd/evolve/firstmergecache.py Wed Mar 04 15:21:32 2020 -0800 +++ b/hgext3rd/evolve/firstmergecache.py Wed Mar 04 16:03:23 2020 +0100 @@ -16,11 +16,7 @@ node as nodemod, ) -try: - from mercurial.utils.stringutil import forcebytestr -except ImportError: - # hg <= 4.5 (f99d64e8a4e4) - from mercurial.util import forcebytestr +from mercurial.utils.stringutil import forcebytestr from . import ( compat, diff -r 307bb57ff2ce -r b9af7b8f3eee hgext3rd/evolve/obscache.py --- a/hgext3rd/evolve/obscache.py Wed Mar 04 15:21:32 2020 -0800 +++ b/hgext3rd/evolve/obscache.py Wed Mar 04 16:03:23 2020 +0100 @@ -19,11 +19,7 @@ util, ) -try: - from mercurial.utils.stringutil import forcebytestr -except ImportError: - # hg <= 4.5 (f99d64e8a4e4) - from mercurial.util import forcebytestr +from mercurial.utils.stringutil import forcebytestr from . import ( compat, diff -r 307bb57ff2ce -r b9af7b8f3eee hgext3rd/evolve/obsdiscovery.py --- a/hgext3rd/evolve/obsdiscovery.py Wed Mar 04 15:21:32 2020 -0800 +++ b/hgext3rd/evolve/obsdiscovery.py Wed Mar 04 16:03:23 2020 +0100 @@ -34,11 +34,7 @@ ) from mercurial.i18n import _ -try: - from mercurial.utils.stringutil import forcebytestr -except ImportError: - # hg <= 4.5 (f99d64e8a4e4) - from mercurial.util import forcebytestr +from mercurial.utils.stringutil import forcebytestr from . import ( compat, diff -r 307bb57ff2ce -r b9af7b8f3eee hgext3rd/evolve/stablerangecache.py --- a/hgext3rd/evolve/stablerangecache.py Wed Mar 04 15:21:32 2020 -0800 +++ b/hgext3rd/evolve/stablerangecache.py Wed Mar 04 16:03:23 2020 +0100 @@ -22,11 +22,7 @@ util, ) -try: - from mercurial.utils.stringutil import forcebytestr -except ImportError: - # hg <= 4.5 (f99d64e8a4e4) - from mercurial.util import forcebytestr +from mercurial.utils.stringutil import forcebytestr from . import ( compat, diff -r 307bb57ff2ce -r b9af7b8f3eee hgext3rd/evolve/stablesort.py --- a/hgext3rd/evolve/stablesort.py Wed Mar 04 15:21:32 2020 -0800 +++ b/hgext3rd/evolve/stablesort.py Wed Mar 04 16:03:23 2020 +0100 @@ -259,11 +259,7 @@ scmutil, ) -try: - from mercurial.utils.stringutil import forcebytestr -except ImportError: - # hg <= 4.5 (f99d64e8a4e4) - from mercurial.util import forcebytestr +from mercurial.utils.stringutil import forcebytestr from mercurial.i18n import _