commit: 321152e0505a7a008434fc90584156ed687eadee Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Sun Apr 2 19:15:02 2023 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Sun Apr 2 21:12:08 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=321152e0
dev-vcs/mercurial: remove unused patches Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/30448 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> .../files/mercurial-5.8.1-testing-timeout.patch | 12 ---- .../mercurial-6.0.2-testing-pygments211.patch | 64 ---------------------- 2 files changed, 76 deletions(-) diff --git a/dev-vcs/mercurial/files/mercurial-5.8.1-testing-timeout.patch b/dev-vcs/mercurial/files/mercurial-5.8.1-testing-timeout.patch deleted file mode 100644 index 5c68835ccf75..000000000000 --- a/dev-vcs/mercurial/files/mercurial-5.8.1-testing-timeout.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/mercurial/testing/__init__.py b/mercurial/testing/__init__.py ---- a/mercurial/testing/__init__.py -+++ b/mercurial/testing/__init__.py -@@ -25,7 +25,7 @@ def wait_file(path, timeout=10): - timeout *= _timeout_factor() - start = time.time() - while not os.path.exists(path): -- if time.time() - start > timeout: -+ if timeout and time.time() - start > timeout: - raise RuntimeError(b"timed out waiting for file: %s" % path) - time.sleep(0.01) - diff --git a/dev-vcs/mercurial/files/mercurial-6.0.2-testing-pygments211.patch b/dev-vcs/mercurial/files/mercurial-6.0.2-testing-pygments211.patch deleted file mode 100644 index 31dab2c0c0b2..000000000000 --- a/dev-vcs/mercurial/files/mercurial-6.0.2-testing-pygments211.patch +++ /dev/null @@ -1,64 +0,0 @@ -# HG changeset patch -# User Cédric Krier <[email protected]> -# Date 1641731730 -3600 -# Sun Jan 09 13:35:30 2022 +0100 -# Node ID 21c0ae0693bc048907b6e26a4fe160d1b7b48384 -# Parent 28f0092ec89f53ccf6d7b2b92dcaf8e1b02e8c13 -tests: support pygments 2.11 (issue6628) - -Differential Revision: https://phab.mercurial-scm.org/D11970 - -diff --git a/tests/hghave.py b/tests/hghave.py ---- a/tests/hghave.py -+++ b/tests/hghave.py -@@ -663,6 +663,22 @@ def pygments25(): - return (major, minor) >= (2, 5) - - -+@check("pygments211", "Pygments version >= 2.11") -+def pygments211(): -+ try: -+ import pygments -+ -+ v = pygments.__version__ -+ except ImportError: -+ return False -+ -+ parts = v.split(".") -+ major = int(parts[0]) -+ minor = int(parts[1]) -+ -+ return (major, minor) >= (2, 11) -+ -+ - @check("outer-repo", "outer repo") - def has_outer_repo(): - # failing for other reasons than 'no repo' imply that there is a repo -diff --git a/tests/test-run-tests.t b/tests/test-run-tests.t ---- a/tests/test-run-tests.t -+++ b/tests/test-run-tests.t -@@ -176,14 +176,19 @@ test diff colorisation - running 1 tests using 1 parallel processes - - \x1b[38;5;124m--- $TESTTMP/test-failure.t\x1b[39m (esc) -- \x1b[38;5;34m+++ $TESTTMP/test-failure.t.err\x1b[39m (esc) -+ \x1b[38;5;28m+++ $TESTTMP/test-failure.t.err\x1b[39m (esc) (pygments211 !) -+ \x1b[38;5;34m+++ $TESTTMP/test-failure.t.err\x1b[39m (esc) (no-pygments211 !) - \x1b[38;5;90;01m@@ -1,4 +1,4 @@\x1b[39;00m (esc) -- $ echo "bar-baz"; echo "bar-bad"; echo foo -- \x1b[38;5;34m+ bar*baz (glob)\x1b[39m (esc) -- bar*bad (glob) -+ \x1b[38;5;250m \x1b[39m $ echo "bar-baz"; echo "bar-bad"; echo foo (esc) (pygments211 !) -+ $ echo "bar-baz"; echo "bar-bad"; echo foo (no-pygments211 !) -+ \x1b[38;5;28m+ bar*baz (glob)\x1b[39m (esc) (pygments211 !) -+ \x1b[38;5;34m+ bar*baz (glob)\x1b[39m (esc) (no-pygments211 !) -+ \x1b[38;5;250m \x1b[39m bar*bad (glob) (esc) (pygments211 !) -+ bar*bad (glob) (no-pygments211 !) - \x1b[38;5;124m- bar*baz (glob)\x1b[39m (esc) - \x1b[38;5;124m- | fo (re)\x1b[39m (esc) -- \x1b[38;5;34m+ foo\x1b[39m (esc) -+ \x1b[38;5;28m+ foo\x1b[39m (esc) (pygments211 !) -+ \x1b[38;5;34m+ foo\x1b[39m (esc) (no-pygments211 !) - - \x1b[38;5;88mERROR: \x1b[39m\x1b[38;5;9mtest-failure.t\x1b[39m\x1b[38;5;88m output changed\x1b[39m (esc) - !
