Mercurial > hg
view tests/testlib/merge-combination-util.sh @ 48670:6d2ddea0721a stable
stream-clone: filter possible missing requirements using all supported one
The `supportedformat` requirements is missing some important requirements and it
seems better to filter out with all requirements we know, not just an
"arbitrary" subset.
The `supportedformat` set is lacking some important requirements (for example
`revlog-compression-zstd`). This is getting fixed on default (for Mercurial 6.1)
However, fixing that in 6.1 means the stream requirements sent over the wire
will contains more items. And if we don't apply this fix on older version, they
might end up complaining about lacking support for feature they actually support
for years.
This patch does not fix the deeper problem (advertised stream requirement
lacking some of them), but focus on the trivial part : Lets use the full set of
supported requirement for looking for unsupported ones.
This patch should be simple to backport to older version of Mercurial and
packager should be encouraged to do so.
This is a graft of d9017df70135 from default.
Differential Revision: https://phab.mercurial-scm.org/D12091
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Mon, 24 Jan 2022 11:49:06 +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 }