##// END OF EJS Templates
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

File last commit:

r34990:1a314176 stable
r39595:07b58266 default
Show More
test-mq-subrepo-svn.t
56 lines | 1.2 KiB | text/troff | Tads3Lexer
/ tests / test-mq-subrepo-svn.t
Matt Mackall
tests: replace exit 80 with #require
r22046 #require svn13
Kevin Bullock
subrepo: separate out mq+svn subrepo tests...
r13300
Yuya Nishihara
tests: write hgrc of more than two lines by using shell heredoc...
r23172 $ cat <<EOF >> $HGRCPATH
> [extensions]
> mq =
> [diff]
> nodates = 1
Yuya Nishihara
subrepo: disable git and svn subrepos by default (BC) (SEC)...
r34988 > [subrepos]
Gregory Szorc
subrepo: use per-type config options to enable subrepos...
r34990 > allowed = true
> svn:allowed = true
Yuya Nishihara
tests: write hgrc of more than two lines by using shell heredoc...
r23172 > EOF
Kevin Bullock
subrepo: separate out mq+svn subrepo tests...
r13300
Kevin Bullock
test-subrepo-mq-svn.t: correct comment...
r13326 fn to create new repository, and cd into it
Kevin Bullock
subrepo: separate out mq+svn subrepo tests...
r13300 $ mkrepo() {
> hg init $1
> cd $1
> hg qinit
> }
handle svn subrepos safely
$ svnadmin create svn-repo-2499
Mads Kiilerich
tests: cleanup of svn url handling...
r17033
$ SVNREPOPATH=`pwd`/svn-repo-2499/project
#if windows
Augie Fackler
tests: use $PYTHON instead of hardcoding python...
r22947 $ SVNREPOURL=file:///`$PYTHON -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`
Mads Kiilerich
tests: cleanup of svn url handling...
r17033 #else
Augie Fackler
tests: use $PYTHON instead of hardcoding python...
r22947 $ SVNREPOURL=file://`$PYTHON -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`
Mads Kiilerich
tests: cleanup of svn url handling...
r17033 #endif
Kevin Bullock
subrepo: separate out mq+svn subrepo tests...
r13300 $ mkdir -p svn-project-2499/trunk
Yuya Nishihara
tests: suppress verbose output of svn transaction...
r26374 $ svn import -qm 'init project' svn-project-2499 "$SVNREPOURL"
Kevin Bullock
subrepo: separate out mq+svn subrepo tests...
r13300
qnew on repo w/svn subrepo
$ mkrepo repo-2499-svn-subrepo
Mads Kiilerich
tests: cleanup of svn url handling...
r17033 $ svn co "$SVNREPOURL"/trunk sub
Kevin Bullock
subrepo: separate out mq+svn subrepo tests...
r13300 Checked out revision 1.
$ echo 'sub = [svn]sub' >> .hgsub
$ hg add .hgsub
Matt Mackall
tests: fixes for svn 1.4.2
r13410 $ hg status -S -X '**/format'
Kevin Bullock
subrepo: separate out mq+svn subrepo tests...
r13300 A .hgsub
$ hg qnew -m0 0.diff
$ cd sub
$ echo a > a
$ svn add a
A a
$ svn st
Matt Mackall
tests: fixes for svn 1.4.2
r13410 A* a (glob)
Kevin Bullock
subrepo: separate out mq+svn subrepo tests...
r13300 $ cd ..
$ hg status -S # doesn't show status for svn subrepos (yet)
$ hg qnew -m1 1.diff
Matt Harbison
subrepo: make the output references to subrepositories consistent...
r33365 abort: uncommitted changes in subrepository "sub"
Kevin Bullock
subrepo: separate out mq+svn subrepo tests...
r13300 [255]
Mads Kiilerich
tests: add missing trailing 'cd ..'...
r16913
$ cd ..