Mercurial > hg
view tests/testlib/merge-combination-util.sh @ 49603:3eda36e9b3d6 stable
matcher: fix issues regex flag contained in pattern (issue6759)
Python 3.11 is now enforcing that flag must be at the beginning of the regex
This creates a serious regression for people using Python 3.11 with an hgignore
using flag in a "relre" pattern.
We now detect any flags in such pattern and "prepend" our ".*" pattern after them.
In addition, we now insert the flag in the regexp to only affect the pattern we
are rewriting. Otherwise, the regex built from the combined pattern would these
flags in the middle of it anyway.
As a side effect of this last change, we fix a bug… before this change regex
flag in a pattern would affect all combined patterns. That was bad and is not
longer the case.
The Rust code needs to be updated to fix that very bug, but we will do it in
another changeset.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Wed, 16 Nov 2022 13:05:01 +0100 |
parents | e8b0c519dfb3 |
children |
line wrap: on
line source
# genmerges is the workhorse of the test-merge-combination-*.t tests. # Given: # - a `range` function describing the possible values for file a # - a `isgood` function to filter out uninteresting combination # - a `createfile` function to actually write the values for file a on the # filesystem # # it print a series of lines that look like: abcd C: output of -T {files} # describing the file a at respectively the base, p2, p1, merge # revision. "C" indicates that hg merge had conflicts. genmerges () { (LC_ALL=C type range | grep -q 'function') || (echo >&2 "missing function: range") (LC_ALL=C type isgood | grep -q 'function') || (echo >&2 "missing function: isgood") (LC_ALL=C type createfile | grep -q 'function') || (echo >&2 "missing function: createfile") for base in `range` -; do for r1 in `range $base` -; do for r2 in `range $base $r1` -; do for m in `range $base $r1 $r2` -; do line="$base$r1$r2$m" isgood $line || continue hg init repo cd repo make_commit () { v=$1; msg=$2; file=$3; if [ $v != - ]; then createfile $v else if [ -f a ] then rm a else touch $file fi fi hg commit -q -Am $msg || exit 123 } echo foo > foo make_commit $base base b make_commit $r1 r1 c hg up -r 0 -q make_commit $r2 r2 d hg merge -q -r 1 > ../output 2>&1 if [ $? -ne 0 ]; then rm -f *.orig; hg resolve -m --all -q; fi if [ -s ../output ]; then conflicts=" C"; else conflicts=" "; fi make_commit $m m e if [ $m = $r1 ] && [ $m = $r2 ] then expected= elif [ $m = $r1 ] then if [ $base = $r2 ] then expected= else expected=a fi elif [ $m = $r2 ] then if [ $base = $r1 ] then expected= else expected=a fi else expected=a fi got=`hg log -r 3 --template '{files}\n' | tr -d 'e '` if [ "$got" = "$expected" ] then echo "$line$conflicts: agree on \"$got\"" else echo "$line$conflicts: hg said \"$got\", expected \"$expected\"" fi cd ../ rm -rf repo done done done done }