changeset 43552:bd87114ce341

index: add a `rev` method (API)

The new `index.rev(node)` is to be preferred over using `node
index.nodemap[node]`.

This get us closer to be able to remove the `nodemap` attribute of the index.

Differential Revision: https://phab.mercurial-scm.org/D7324

--- a/mercurial/cext/parsers.c	Fri Nov 08 13:26:55 2019 +0100
+++ b/mercurial/cext/parsers.c	Sat Nov 09 13:23:51 2019 +0100
@@ -667,7 +667,7 @@
 void manifest_module_init(PyObject *mod);
 void revlog_module_init(PyObject *mod);
 
-static const int version = 14;
+static const int version = 15;
 
 static void module_init(PyObject *mod)
 {

--- a/mercurial/cext/revlog.c	Fri Nov 08 13:26:55 2019 +0100
+++ b/mercurial/cext/revlog.c	Sat Nov 09 13:23:51 2019 +0100
@@ -2073,6 +2073,21 @@
 	return PyBool_FromLong((long)ret);
 }
 
+static PyObject *index_m_rev(indexObject *self, PyObject *val)
+{
+	char *node;
+	int rev;
+
+	if (node_check(val, &node) == -1)
+		return NULL;
+	rev = index_find_node(self, node, 20);
+	if (rev >= -1)
+		return PyInt_FromLong(rev);
+	if (rev == -2)
+		raise_revlog_error();
+	return NULL;
+}
+
 typedef uint64_t bitmask;
 
 /*
@@ -2733,6 +2748,8 @@
     {"get", (PyCFunction)index_m_get, METH_VARARGS, "get an index entry"},
     {"has_node", (PyCFunction)index_m_has_node, METH_O,
      "return True if the node exist in the index"},
+    {"rev", (PyCFunction)index_m_rev, METH_O,
+     "return `rev` associated with a node or raise RevlogError"},
     {"computephasesmapsets", (PyCFunction)compute_phases_map_sets, METH_VARARGS,
      "compute phases"},
     {"reachableroots2", (PyCFunction)reachableroots2, METH_VARARGS,

--- a/mercurial/policy.py	Fri Nov 08 13:26:55 2019 +0100
+++ b/mercurial/policy.py	Sat Nov 09 13:23:51 2019 +0100
@@ -80,7 +80,7 @@
     ('cext', 'bdiff'): 3,
     ('cext', 'mpatch'): 1,
     ('cext', 'osutil'): 4,
-    ('cext', 'parsers'): 14,
+    ('cext', 'parsers'): 15,
 }
 
 # map import request to other package or module

--- a/mercurial/pure/parsers.py	Fri Nov 08 13:26:55 2019 +0100
+++ b/mercurial/pure/parsers.py	Sat Nov 09 13:23:51 2019 +0100
@@ -59,6 +59,12 @@
         """return True if the node exist in the index"""
         return node in self.nodemap
 
+    def rev(self, node):
+        """return a revision for a node
+
+        If the node is unknown, raise a RevlogError"""
+        return self.nodemap[node]
+
     def _stripnodes(self, start):
         if 'nodemap' in vars(self):
             for r in range(start, len(self)):

--- a/mercurial/revlog.py	Fri Nov 08 13:26:55 2019 +0100
+++ b/mercurial/revlog.py	Sat Nov 09 13:23:51 2019 +0100
@@ -217,6 +217,12 @@
         """return True if the node exist in the index"""
         return node in self.nodemap
 
+    def rev(self, node):
+        """return a revision for a node
+
+        If the node is unknown, raise a RevlogError"""
+        return self.nodemap[node]
+
     def append(self, tup):
         self.nodemap[tup[7]] = len(self)
         super(revlogoldindex, self).append(tup)