upstream/mercurial-mirror Files · tests/helpers-testrepo.sh

wireprotov2: implement commands as a generator of objects...

wireprotov2: implement commands as a generator of objects Previously, wire protocol version 2 inherited version 1's model of having separate types to represent the results of different wire protocol commands. As I implemented more powerful commands in future commits, I found I was using a common pattern of returning a special type to hold a generator. This meant the command function required a closure to do most of the work. That made logic flow more difficult to follow. I also noticed that many commands were effectively a sequence of objects to be CBOR encoded. I think it makes sense to define version 2 commands as generators. This way, commands can simply emit the data structures they wish to send to the client. This eliminates the need for a closure in command functions and removes encoding from the bodies of commands. As part of this commit, the handling of response objects has been moved into the serverreactor class. This puts the reactor in the driver's seat with regards to CBOR encoding and error handling. Having error handling in the function that emits frames is particularly important because exceptions in that function can lead to things getting in a bad state: I'm fairly certain that uncaught exceptions in the frame generator were causing deadlocks. I also introduced a dedicated error type for explicit error reporting in command handlers. This will be used in subsequent commits. There's still a bit of work to be done here, especially around formalizing the error handling "protocol." I've added yet another TODO to track this so we don't forget. Test output changed because we're using generators and no longer know we are at the end of the data until we hit the end of the generator. This means we can't emit the end-of-stream flag until we've exhausted the generator. Hence the introduction of 0-sized end-of-stream frames. Differential Revision: https://phab.mercurial-scm.org/D4472

Yuya Nishihara - - Load All Authors

File last commit:

r37493:152f1b47 default


                r39595:07b58266

default

Download file

             helpers-testrepo.sh
        
                    60 lines
            
             | 1.9 KiB
            
                | application/x-sh
            
             |
                BashLexer
            
             / tests / helpers-testrepo.sh
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # In most cases, the mercurial repository can be read by the bundled hg, but

      # that isn't always true because third-party extensions may change the store

      # format, for example. In which case, the system hg installation is used.

      #

      # We want to use the hg version being tested when interacting with the test

      # repository, and the system hg when interacting with the mercurial source code

      # repository.

      #

      # The mercurial source repository was typically orignally cloned with the

      # system mercurial installation, and may require extensions or settings from

      # the system installation.

      if [ -n "$HGTESTEXTRAEXTENSIONS" ]; then

          for extension in $HGTESTEXTRAEXTENSIONS; do

              extraoptions="$extraoptions --config extensions.$extension=!"

          done

      fi

      syshg () {

          (

              syshgenv

              exec hg "$@"

          )

      }

      # Revert the environment so that running "hg" runs the system hg

      # rather than the test hg installation.

      syshgenv () {

          . "$HGTEST_RESTOREENV"

          HGPLAIN=1

          export HGPLAIN

      }

      # The test-repo is a live hg repository which may have evolution markers

      # created, e.g. when a ~/.hgrc enabled evolution.

      #

      # Tests may be run using a custom HGRCPATH, which do not enable evolution

      # markers by default.

      #

      # If test-repo includes evolution markers, and we do not enable evolution

      # markers, hg will occasionally complain when it notices them, which disrupts

      # tests resulting in sporadic failures.

      #

      # Since we aren't performing any write operations on the test-repo, there's

      # no harm in telling hg that we support evolution markers, which is what the

      # following lines for the hgrc file do:

      cat >> "$HGRCPATH" << EOF

      [experimental]

      evolution = createmarkers

      EOF

      # Use the system hg command if the bundled hg can't read the repository with

      # no warning nor error.

      if [ -n "`hg id -R "$TESTDIR/.." 2>&1 >/dev/null`" ]; then

          alias testrepohg=syshg

          alias testrepohgenv=syshgenv

      else

          alias testrepohg="hg $extraoptions"

          alias testrepohgenv=:

      fi

	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

				# In most cases, the mercurial repository can be read by the bundled hg, but
				# that isn't always true because third-party extensions may change the store
				# format, for example. In which case, the system hg installation is used.
				#
				# We want to use the hg version being tested when interacting with the test
				# repository, and the system hg when interacting with the mercurial source code
				# repository.
				#
				# The mercurial source repository was typically orignally cloned with the
				# system mercurial installation, and may require extensions or settings from
				# the system installation.

				if [ -n "$HGTESTEXTRAEXTENSIONS" ]; then
				for extension in $HGTESTEXTRAEXTENSIONS; do
				extraoptions="$extraoptions --config extensions.$extension=!"
				done
				fi

				syshg () {
				(
				syshgenv
				exec hg "$@"
				)
				}

				# Revert the environment so that running "hg" runs the system hg
				# rather than the test hg installation.
				syshgenv () {
				. "$HGTEST_RESTOREENV"
				HGPLAIN=1
				export HGPLAIN
				}

				# The test-repo is a live hg repository which may have evolution markers
				# created, e.g. when a ~/.hgrc enabled evolution.
				#
				# Tests may be run using a custom HGRCPATH, which do not enable evolution
				# markers by default.
				#
				# If test-repo includes evolution markers, and we do not enable evolution
				# markers, hg will occasionally complain when it notices them, which disrupts
				# tests resulting in sporadic failures.
				#
				# Since we aren't performing any write operations on the test-repo, there's
				# no harm in telling hg that we support evolution markers, which is what the
				# following lines for the hgrc file do:
				cat >> "$HGRCPATH" << EOF
				[experimental]
				evolution = createmarkers
				EOF

				# Use the system hg command if the bundled hg can't read the repository with
				# no warning nor error.
				if [ -n "`hg id -R "$TESTDIR/.." 2>&1 >/dev/null`" ]; then
				alias testrepohg=syshg
				alias testrepohgenv=syshgenv
				else
				alias testrepohg="hg $extraoptions"
				alias testrepohgenv=:
				fi