--- a/mercurial/obsutil.py Wed Nov 06 16:54:34 2019 +0100
+++ b/mercurial/obsutil.py Sat Nov 09 10:31:58 2019 +0100
@@ -112,6 +112,11 @@
yield marker(repo, markerdata)
+def sortedmarkers(markers):
+ # last item of marker tuple ('parents') may be None or a tuple
+ return sorted(markers, key=lambda m: m[:-1] + (m[-1] or (),))
+
+
def closestpredecessors(repo, nodeid):
"""yield the list of next predecessors pointing on visible changectx nodes
@@ -675,7 +680,7 @@
# Having none means pruned node, multiple successors means split,
# single successors are standard replacement.
#
- for mark in sorted(succmarkers[current]):
+ for mark in sortedmarkers(succmarkers[current]):
for suc in mark[1]:
if suc not in cache:
if suc in stackedset:
@@ -712,7 +717,7 @@
# duplicated entry and successors set that are strict subset of
# another one.
succssets = []
- for mark in sorted(succmarkers[current]):
+ for mark in sortedmarkers(succmarkers[current]):
# successors sets contributed by this marker
base = _succs()
base.markers.add(mark)