| pulkit |
| hg-reviewers |
This open the way to splitting this slow test in multiple ones.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | tests/test-merge-combination.t (65 lines) | |||
| A | M | tests/testlib/merge-combination-util.sh (73 lines) |
| This file shows what hg says are "modified" files for a merge commit | This file shows what hg says are "modified" files for a merge commit | ||||
| (hg log -T {files}), somewhat exhaustively. | (hg log -T {files}), somewhat exhaustively. | ||||
| It shows merges that involves files contents changing, and merges that | It shows merges that involves files contents changing, and merges that | ||||
| involve executable bit changing, but not merges with multiple or zero | involve executable bit changing, but not merges with multiple or zero | ||||
| merge ancestors, nor copies/renames, and nor identical file contents | merge ancestors, nor copies/renames, and nor identical file contents | ||||
| with different filelog revisions. | with different filelog revisions. | ||||
| genmerges is the workhorse. Given: | $ . $TESTDIR/testlib/merge-combination-util.sh | ||||
| - 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 () { | |||||
| > 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 | |||||
| > } | |||||
| All the merges of various file contents. | All the merges of various file contents. | ||||
| $ range () { | $ range () { | ||||
| > max=0 | > max=0 | ||||
| > for i in $@; do | > for i in $@; do | ||||
| > if [ $i = - ]; then continue; fi | > if [ $i = - ]; then continue; fi | ||||
| > if [ $i -gt $max ]; then max=$i; fi | > if [ $i -gt $max ]; then max=$i; fi | ||||
| # 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 | |||||
| } | |||||