From f059b0eb324e46294ea6b992b79be8c0adbb514b Mon Sep 17 00:00:00 2001 From: Debian Python Team Date: Wed, 7 Dec 2022 12:59:55 +0000 Subject: [PATCH] revset-random-maxsize # HG changeset patch # User Julien Cristau # Date 1670335911 -3600 # Tue Dec 06 15:11:51 2022 +0100 # Node ID 150e204372c63962af7913543ee74296aab393b1 # Parent 4cedae992ed10d764e83a4a54721433c5c51d0f9 revset: the `random` sort should not depend on sys.maxsize (issue6770) Gbp-Pq: Name revset-random-maxsize.patch --- mercurial/revset.py | 3 +-- tests/test-revset.t | 12 ++++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/mercurial/revset.py b/mercurial/revset.py index 4479b09..89e0204 100644 --- a/mercurial/revset.py +++ b/mercurial/revset.py @@ -10,7 +10,6 @@ import binascii import functools import random import re -import sys from .i18n import _ from .pycompat import getattr @@ -2355,7 +2354,7 @@ def roots(repo, subset, x): return subset & s.filter(filter, condrepr=b'') -MAXINT = sys.maxsize +MAXINT = (1<<31) - 1 MININT = -MAXINT - 1 diff --git a/tests/test-revset.t b/tests/test-revset.t index 6b83e69..d59feb3 100644 --- a/tests/test-revset.t +++ b/tests/test-revset.t @@ -2981,16 +2981,16 @@ random sort $ hg log --rev 'sort(all(), "-random")' | wc -l \s*8 (re) $ hg log --rev 'sort(all(), "random", random.seed=celeste)' + 0 b12 m111 u112 111 10800 + 4 b111 m112 u111 110 14400 + 2 b111 m11 u12 111 3600 6 b111 t2 tu 130 0 + 1 b11 m12 u111 112 7200 7 b111 t3 tu 130 0 - 4 b111 m112 u111 110 14400 - 3 b112 m111 u11 120 0 5 b111 t1 tu 130 0 - 0 b12 m111 u112 111 10800 - 1 b11 m12 u111 112 7200 - 2 b111 m11 u12 111 3600 + 3 b112 m111 u11 120 0 $ hg log --rev 'first(sort(all(), "random", random.seed=celeste))' - 6 b111 t2 tu 130 0 + 0 b12 m111 u112 111 10800 topographical sorting can't be combined with other sort keys, and you can't -- 2.30.2