upstream/mercurial-mirror Files · tests/testlib/merge-combination-util.sh

dirstate: introduce a "tracked-key" feature...

dirstate: introduce a "tracked-key" feature A new format variant is introduced. When used, a `tracked-key` file will be generated. That file will be update when the set of tracked file might have changed. This will be useful for external automation (e.g. build tool) to be notified when the set of relevant files changes. One of the motivation for this changes is to mitigate effect dirstate-v2 has on such automation. Since the dirstate file is updated much more frequently on dirstate-v2, monitoring update to that file is no longer a viable strategy. See the associated documentation for details about the feature To prevent older client to update the repository without updating that file, a new requirements is introduced. The `postfinalizegenerators` business is a bit weird, so I'll likely clean that up soon. Differential Revision: https://phab.mercurial-scm.org/D12124

marmoute - - Load All Authors

File last commit:

r46892:e8b0c519 default


                r49533:568f63b5

default

Download file

             merge-combination-util.sh
        
                    73 lines
            
             | 2.4 KiB
            
                | application/x-sh
            
             |
                BashLexer
            
             / tests / testlib / merge-combination-util.sh
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # 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

      }

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				# 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
				}