Mercurial > hg

diff tests/test-copies-chain-merge.t @ 50725:7e5be4a7cda7 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: use grep -E instead of obsolescent egrep Testing on Fedora 38 failed with: egrep: warning: egrep is obsolescent; using grep -E The warning comes from https://git.savannah.gnu.org/cgit/grep.git/commit/?id=a9515624709865d480e3142fd959bccd1c9372d1 . For further anecdotal evidence of the change, see https://www.phoronix.com/news/GNU-Grep-3.8-Stop-egrep-fgrep . This reverses the code check that goes back to e7d3b509af8b. grep -E is POSIX, but there is a risk that it doesn't work the same on all platforms - especially older Unix versions. It should however always be possible to put a GNU grep in $PATH before running the tests.
author Mads Kiilerich <mads@kiilerich.com>
date Mon, 26 Jun 2023 14:34:58 +0200
parents 4141951dacff
children
line wrap: on
line diff
--- a/tests/test-copies-chain-merge.t	Mon Jun 26 11:15:30 2023 +0100
+++ b/tests/test-copies-chain-merge.t	Mon Jun 26 14:34:58 2023 +0200
@@ -1649,7 +1649,7 @@
   > [format]
   > exp-use-copies-side-data-changeset = yes
   > EOF
-  $ hg debugformat -v | egrep 'changelog-v2|revlog-v2|copies-sdc'
+  $ hg debugformat -v | grep -E 'changelog-v2|revlog-v2|copies-sdc'
   copies-sdc:          no    yes      no
   revlog-v2:           no     no      no
   changelog-v2:        no    yes      no
@@ -1675,7 +1675,7 @@
   > enabled=yes
   > numcpus=8
   > EOF
-  $ hg debugformat -v  | egrep 'changelog-v2|revlog-v2|copies-sdc'
+  $ hg debugformat -v  | grep -E 'changelog-v2|revlog-v2|copies-sdc'
   copies-sdc:          no    yes      no
   revlog-v2:           no     no      no
   changelog-v2:        no    yes      no
@@ -2919,14 +2919,14 @@
 
 Details on this hash ordering pick:
 
-  $ hg manifest --debug 'desc("g-1")' | egrep 'd$'
+  $ hg manifest --debug 'desc("g-1")' | grep -E 'd$'
   17ec97e605773eb44a117d1136b3849bcdc1924f 644   d (no-changeset !)
   5cce88bf349f7c742bb440f2c53f81db9c294279 644   d (changeset !)
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("g-1")' d
   A d
     a (no-changeset no-compatibility !)
 
-  $ hg manifest --debug 'desc("f-2")' | egrep 'd$'
+  $ hg manifest --debug 'desc("f-2")' | grep -E 'd$'
   7b79e2fe0c8924e0e598a82f048a7b024afa4d96 644   d (no-changeset !)
   ae258f702dfeca05bf9b6a22a97a4b5645570f11 644   d (changeset !)
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("f-2")' d