Source: mercurial Followup-For: Bug #1006383 Control: tags -1 patch Dear maintainer,
This issue is blocking pygments from migrating to testing. I tried to prepare an NMU, but with the attached patch for the original issue, autopkgtest fails locally for me on 4 other tests, so I'm unsure if it's enough. Paul
diff --git a/debian/patches/series b/debian/patches/series index b639c36..7ff5f74 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ deb_specific__optional-dependencies deb_specific__disable_libdir_replacement.patch 0005-Tolerate-SIGINT-getting-the-kill-in-test-stdio.py.patch deb_specific__which_silence_warning.patch +tests-update-for-latest-pygments.patch diff --git a/debian/patches/tests-update-for-latest-pygments.patch b/debian/patches/tests-update-for-latest-pygments.patch new file mode 100644 index 0000000..a2477c8 --- /dev/null +++ b/debian/patches/tests-update-for-latest-pygments.patch @@ -0,0 +1,31 @@ +From: Paul Gevers <elb...@debian.org> +Date: Sun, 13 Mar 2022 20:42:58 +0100 +X-Dgit-Generated: 6.0.2-1.1 1565c552b0b79a69eea8b1ac12e2c211d01c3df1 +Subject: tests: update for latest pygments + +Closes: #1006383 + +--- + +--- mercurial-6.0.2.orig/tests/test-run-tests.t ++++ mercurial-6.0.2/tests/test-run-tests.t +@@ -176,14 +176,14 @@ 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) + \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) ++ \x1b[38;5;28m+ bar*baz (glob)\x1b[39m (esc) ++ \x1b[38;5;250m \x1b[39m bar*bad (glob) (esc) + \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) + + \x1b[38;5;88mERROR: \x1b[39m\x1b[38;5;9mtest-failure.t\x1b[39m\x1b[38;5;88m output changed\x1b[39m (esc) + !
