--- a/mercurial/obsolete.py Tue Jun 27 01:51:40 2017 +0200
+++ b/mercurial/obsolete.py Tue Jun 27 02:06:15 2017 +0200
@@ -796,21 +796,6 @@
finally:
lock.release()
-def getmarkers(repo, nodes=None, exclusive=False):
- """returns markers known in a repository
-
- If <nodes> is specified, only markers "relevant" to those nodes are are
- returned"""
- if nodes is None:
- rawmarkers = repo.obsstore
- elif exclusive:
- rawmarkers = obsutil.exclusivemarkers(repo, nodes)
- else:
- rawmarkers = repo.obsstore.relevantmarkers(nodes)
-
- for markerdata in rawmarkers:
- yield obsutil.marker(repo, markerdata)
-
# keep compatibility for the 4.3 cycle
def allprecursors(obsstore, nodes, ignoreflags=0):
movemsg = 'obsolete.allprecursors moved to obsutil.allprecursors'
@@ -827,6 +812,11 @@
repo.ui.deprecwarn(movemsg, '4.3')
return obsutil.marker(repo, data)
+def getmarkers(repo, nodes=None, exclusive=False):
+ movemsg = 'obsolete.getmarkers moved to obsutil.getmarkers'
+ repo.ui.deprecwarn(movemsg, '4.3')
+ return obsutil.getmarkers(repo, nodes=nodes, exclusive=exclusive)
+
def exclusivemarkers(repo, nodes):
movemsg = 'obsolete.exclusivemarkers moved to obsutil.exclusivemarkers'
repo.ui.deprecwarn(movemsg, '4.3')