--- a/mercurial/testing/storage.py Wed Oct 07 14:26:47 2020 +0530
+++ b/mercurial/testing/storage.py Sun Oct 18 22:18:02 2020 +0200
@@ -1117,7 +1117,22 @@
return 0
with self._maketransactionfn() as tr:
- nodes = f.addgroup([], None, tr, addrevisioncb=cb)
+ nodes = []
+
+ def onchangeset(cl, node):
+ nodes.append(node)
+ cb(cl, node)
+
+ def ondupchangeset(cl, node):
+ nodes.append(node)
+
+ f.addgroup(
+ [],
+ None,
+ tr,
+ addrevisioncb=onchangeset,
+ duplicaterevisioncb=ondupchangeset,
+ )
self.assertEqual(nodes, [])
self.assertEqual(callbackargs, [])
@@ -1136,7 +1151,22 @@
]
with self._maketransactionfn() as tr:
- nodes = f.addgroup(deltas, linkmapper, tr, addrevisioncb=cb)
+ nodes = []
+
+ def onchangeset(cl, node):
+ nodes.append(node)
+ cb(cl, node)
+
+ def ondupchangeset(cl, node):
+ nodes.append(node)
+
+ f.addgroup(
+ deltas,
+ linkmapper,
+ tr,
+ addrevisioncb=onchangeset,
+ duplicaterevisioncb=ondupchangeset,
+ )
self.assertEqual(
nodes,
@@ -1175,7 +1205,19 @@
deltas.append((nodes[i], nullid, nullid, nullid, nullid, delta, 0))
with self._maketransactionfn() as tr:
- self.assertEqual(f.addgroup(deltas, lambda x: 0, tr), nodes)
+ newnodes = []
+
+ def onchangeset(cl, node):
+ newnodes.append(node)
+
+ f.addgroup(
+ deltas,
+ lambda x: 0,
+ tr,
+ addrevisioncb=onchangeset,
+ duplicaterevisioncb=onchangeset,
+ )
+ self.assertEqual(newnodes, nodes)
self.assertEqual(len(f), len(deltas))
self.assertEqual(list(f.revs()), [0, 1, 2])