Mercurial > evolve
changeset 4942:acc7e27fa5c6
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.
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Fri, 15 Nov 2019 11:37:34 +0700 |
| parents | c6fb901b7bc8 |
| children | ad2a8a649b61 |
| files | hgext3rd/topic/__init__.py hgext3rd/topic/compat.py |
| diffstat | 2 files changed, 2 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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]:
--- 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