Skip to content
Snippets Groups Projects
Commit 1b57516a9a56 authored by Raphaël Gomès's avatar Raphaël Gomès
Browse files

serverminitopic: compatibility for cl.nodemap.get vs cl.index.get_rev

parent 7eb5b33868bc
No related branches found
No related tags found
1 merge request!412serverminitopic: stop using removed nodemap API
Pipeline #39723 passed
...@@ -33,6 +33,14 @@ ...@@ -33,6 +33,14 @@
default=False, default=False,
) )
# nodemap.get and index.[has_node|rev|get_rev]
# hg <= 5.2 (02802fa87b74)
def getgetrev(cl):
"""Returns index.get_rev or nodemap.get (for pre-5.3 Mercurial)."""
if util.safehasattr(cl.index, 'get_rev'):
return cl.index.get_rev
return cl.nodemap.get
# hg <= 5.4 (e2d17974a869) # hg <= 5.4 (e2d17974a869)
def nonpublicphaseroots(repo): def nonpublicphaseroots(repo):
if util.safehasattr(repo._phasecache, 'nonpublicphaseroots'): if util.safehasattr(repo._phasecache, 'nonpublicphaseroots'):
...@@ -113,5 +121,5 @@ ...@@ -113,5 +121,5 @@
revs = set() revs = set()
cl = repo.changelog cl = repo.changelog
fr = cl.filteredrevs fr = cl.filteredrevs
nm = cl.nodemap getrev = getgetrev(cl)
for n in nonpublicphaseroots(repo): for n in nonpublicphaseroots(repo):
...@@ -117,5 +125,5 @@ ...@@ -117,5 +125,5 @@
for n in nonpublicphaseroots(repo): for n in nonpublicphaseroots(repo):
r = nm.get(n) r = getrev(n)
if r not in fr and r < maxrev: if r not in fr and r < maxrev:
revs.add(r) revs.add(r)
key = node.nullid key = node.nullid
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment