# HG changeset patch # User Anton Shestakov # Date 1573792654 -25200 # Node ID acc7e27fa5c66ace2319c6e758382936cdd14afd # Parent c6fb901b7bc880c670f263c89a1e96f2d03c14af topic: drop compat.getmarkers() and use obsutil.getmarkers() directly The function in question was moved from obsolete to obsutil in a14e2e7f7d1f (hg 4.3). See also 6aff4bb3970d for hgext3rd/evolve. diff -r c6fb901b7bc8 -r acc7e27fa5c6 hgext3rd/topic/__init__.py --- a/hgext3rd/topic/__init__.py Fri Nov 15 08:14:06 2019 -0800 +++ b/hgext3rd/topic/__init__.py Fri Nov 15 11:37:34 2019 +0700 @@ -135,6 +135,7 @@ namespaces, node, obsolete, + obsutil, patch, phases, pycompat, @@ -1117,7 +1118,7 @@ user = repo[revs].user() # looking on the markers also to get more information and accurate # last touch time. - obsmarkers = compat.getmarkers(repo, [repo[revs].node()]) + obsmarkers = obsutil.getmarkers(repo, [repo[revs].node()]) for marker in obsmarkers: rt = marker.date() if rt[0] > maxtime[0]: diff -r c6fb901b7bc8 -r acc7e27fa5c6 hgext3rd/topic/compat.py --- a/hgext3rd/topic/compat.py Fri Nov 15 08:14:06 2019 -0800 +++ b/hgext3rd/topic/compat.py Fri Nov 15 11:37:34 2019 +0700 @@ -14,17 +14,13 @@ util, ) -getmarkers = None successorssets = None try: from mercurial import obsutil - getmarkers = getattr(obsutil, 'getmarkers', None) successorssets = getattr(obsutil, 'successorssets', None) except ImportError: pass -if getmarkers is None: - getmarkers = obsolete.getmarkers if successorssets is None: successorssets = obsolete.successorssets