This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3298

debugcommands: use command executor for invoking commands
ClosedPublic

Authored by indygreg on Apr 12 2018, 3:59 PM.

Download Raw Diff

Details

Reviewers

durin42

Group Reviewers

hg-reviewers

Commits

rHGfe8c6f9f2914: debugcommands: use command executor for invoking commands

Summary

Now that all peers support the command executor interface, we
can use it in place of peer._call() (which isn't part of the public
API).

Tests changed because we are now returning the decoded response
instead of the raw bytes. The raw bytes over the wire are already
logged. So we're not losing any test coverage. In fact, we're adding
test coverage because we're testing decoding of those command
responses as well.

Diff Detail

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

indygreg created this revision.Apr 12 2018, 3:59 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptApr 12 2018, 3:59 PM

Herald added a subscriber: mercurial-devel. · View Herald Transcript

indygreg added a child revision: D3299: wireproto: add media type to version 2 capabilities response.Apr 12 2018, 3:59 PM

indygreg updated this revision to Diff 8154.Apr 13 2018, 5:36 PM

durin42 accepted this revision.Apr 13 2018, 6:06 PM

This revision is now accepted and ready to land.Apr 13 2018, 6:06 PM

Closed by commit rHGfe8c6f9f2914: debugcommands: use command executor for invoking commands (authored by indygreg). · Explain WhyApr 13 2018, 6:21 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/debugcommands.py (5 lines)
M			tests/test-http-protocol.t (4 lines)
M			tests/test-ssh-proto.t (40 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	8091		Apr 12 2018, 3:59 PM	★	★
Diff 2	8154		Apr 13 2018, 5:36 PM	★	★
Diff 3	8188	rHGfe8c6f9f29149554da16825989566150b188932f	Apr 13 2018, 3:31 PM	★	★

Status	Author	Revision
Closed	indygreg	D3335 wireproto: expose repository formats via capabilities
Closed	indygreg	D3334 wireprotoframing: record when new stream is encountered
Closed	indygreg	D3333 wireprotoframing: use value passed into function
Closed	indygreg	D3332 httppeer: handle error response from client reactor
Closed	indygreg	D3299 wireproto: add media type to version 2 capabilities response
Closed	indygreg	D3298 debugcommands: use command executor for invoking commands
Closed	indygreg	D3297 httppeer: implement command executor for version 2 peer
Closed	indygreg	D3318 repository: remove ipeercommands from ipeerbase
Closed	indygreg	D3317 wireproto: properly call clonebundles command
Closed	indygreg	D3316 exchange: use command executor for getbundle
Closed	indygreg	D3315 exchange: use command executor for pushkey
Closed	indygreg	D3314 wireproto: use command executor for unbundle
Closed	indygreg	D3296 debugcommands: perform handshake when obtaining httpv2 peer
Closed	indygreg	D3295 wireproto: rename HTTPV2 so it less like HTTP/2
Closed	indygreg	D3294 bundlerepo: use command executor for wire protocol commands
Closed	indygreg	D3293 bundlerepo: rename "other" to "peer"
Closed	indygreg	D3292 bookmarks: use command executor for wire protocol commands
Closed	indygreg	D3291 hg: use command executor for wire protocol commands
Closed	indygreg	D3290 logexchange: use command executor for wire protocol commands
Closed	indygreg	D3289 streamclone: use command executor for wire protocol commands
Closed	indygreg	D3288 discovery: use command executor interface
Closed	indygreg	D3287 discovery: don't redundantly call branchmap
Closed	indygreg	D3273 wireproto: convert legacy commands to command executor
Closed	indygreg	D3272 treediscovery: switch to command executor interface
Closed	indygreg	D3271 wireproto: remove iterbatch() from peer interface (API)
Closed	indygreg	D3270 largefiles: use command executor for batch operation
Closed	indygreg	D3269 wireproto: implement batching on peer executor interface
Closed	indygreg	D3268 wireproto: implement command executor interface for version 1 peers
Closed	indygreg	D3267 repository: define new interface for running commands
Closed	indygreg	D3266 pycompat: export a handle on concurrent.futures
Closed	indygreg	D3265 setup: add packages for concurrent.futures
Closed	indygreg	D3264 futures: switch to absolute and relative imports
Closed	indygreg	D3263 tests: silence pyflakes for thirdparty/concurrent
Closed	indygreg	D3262 futures: get rid of extend_path
Closed	indygreg	D3261 thirdparty: vendor futures 3.2.0
Closed	indygreg	D3260 peer: scatter module to the wind (API)
Closed	indygreg	D3259 wireproto: move version 1 peer functionality to standalone module (API)
Closed	indygreg	D3258 wireproto: move gboptsmap to wireprototypes and rename (API)
Closed	indygreg	D3257 wireproto: move value encoding functions to wireprototypes (API)
Closed	indygreg	D3256 httppeer: basic implementation of capabilities interface
Closed	indygreg	D3255 repository: split capabilities methods into separate interface
Closed	indygreg	D3254 httppeer: implement ipeerconnection

Diff 8091

mercurial/debugcommands.py

	with open(args['PUSHFILE'], r'rb') as fh:			with open(args['PUSHFILE'], r'rb') as fh:
	del args['PUSHFILE']			del args['PUSHFILE']
	res, output = peer._callpush(command, fh,			res, output = peer._callpush(command, fh,
	**pycompat.strkwargs(args))			**pycompat.strkwargs(args))
	ui.status(_('result: %s\n') % stringutil.escapestr(res))			ui.status(_('result: %s\n') % stringutil.escapestr(res))
	ui.status(_('remote output: %s\n') %			ui.status(_('remote output: %s\n') %
	stringutil.escapestr(output))			stringutil.escapestr(output))
	else:			else:
	res = peer._call(command, **pycompat.strkwargs(args))			with peer.commandexecutor() as e:
				f = e.callcommand(command, args)

				res = f.result()
	ui.status(_('response: %s\n') % stringutil.pprint(res))			ui.status(_('response: %s\n') % stringutil.pprint(res))

	elif action == 'batchbegin':			elif action == 'batchbegin':
	if batchedcommands is not None:			if batchedcommands is not None:
	raise error.Abort(_('nested batchbegin not allowed'))			raise error.Abort(_('nested batchbegin not allowed'))

	batchedcommands = []			batchedcommands = []
	elif action == 'batchsubmit':			elif action == 'batchsubmit':

tests/test-http-protocol.t

	s> Server: testing stub value\r\n			s> Server: testing stub value\r\n
	s> Date: $HTTP_DATE$\r\n			s> Date: $HTTP_DATE$\r\n
	s> Content-Type: application/mercurial-0.1\r\n			s> Content-Type: application/mercurial-0.1\r\n
	s> Content-Length: 30\r\n			s> Content-Length: 30\r\n
	s> \r\n			s> \r\n
	s> bookmarks\t\n			s> bookmarks\t\n
	s> namespaces\t\n			s> namespaces\t\n
	s> phases\t			s> phases\t
	response: b'bookmarks\t\nnamespaces\t\nphases\t'			response: {b'bookmarks': b'', b'namespaces': b'', b'phases': b''}

	Same thing, but with "httprequest" command			Same thing, but with "httprequest" command

	$ hg --verbose debugwireproto --peer raw http://$LOCALIP:$HGPORT << EOF			$ hg --verbose debugwireproto --peer raw http://$LOCALIP:$HGPORT << EOF
	> httprequest GET ?cmd=listkeys			> httprequest GET ?cmd=listkeys
	> user-agent: test			> user-agent: test
	> x-hgarg-1: namespace=namespaces			> x-hgarg-1: namespace=namespaces
	> EOF			> EOF
	s> makefile('rb', None)			s> makefile('rb', None)
	s> HTTP/1.1 200 Script output follows\r\n			s> HTTP/1.1 200 Script output follows\r\n
	s> Server: testing stub value\r\n			s> Server: testing stub value\r\n
	s> Date: $HTTP_DATE$\r\n			s> Date: $HTTP_DATE$\r\n
	s> Content-Type: application/mercurial-0.1\r\n			s> Content-Type: application/mercurial-0.1\r\n
	s> Content-Length: 41\r\n			s> Content-Length: 41\r\n
	s> \r\n			s> \r\n
	s> 0000000000000000000000000000000000000000\n			s> 0000000000000000000000000000000000000000\n
	response: b'0000000000000000000000000000000000000000\n'			response: [b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00']

	$ killdaemons.py			$ killdaemons.py
	$ enablehttpv2 empty			$ enablehttpv2 empty
	$ hg -R empty serve -p $HGPORT -d --pid-file hg.pid			$ hg -R empty serve -p $HGPORT -d --pid-file hg.pid
	$ cat hg.pid > $DAEMON_PIDS			$ cat hg.pid > $DAEMON_PIDS

	Client with HTTPv2 enabled automatically upgrades if the server supports it			Client with HTTPv2 enabled automatically upgrades if the server supports it

tests/test-ssh-proto.t

	i> write(10) -> 10: namespaces			i> write(10) -> 10: namespaces
	i> flush() -> None			i> flush() -> None
	o> bufferedreadline() -> 3:			o> bufferedreadline() -> 3:
	o> 30\n			o> 30\n
	o> bufferedread(30) -> 30:			o> bufferedread(30) -> 30:
	o> bookmarks\t\n			o> bookmarks\t\n
	o> namespaces\t\n			o> namespaces\t\n
	o> phases\t			o> phases\t
	response: b'bookmarks\t\nnamespaces\t\nphases\t'			response: {b'bookmarks': b'', b'namespaces': b'', b'phases': b''}

	testing ssh2			testing ssh2
	creating ssh peer from handshake results			creating ssh peer from handshake results
	i> write(171) -> 171:			i> write(171) -> 171:
	i> upgrade * proto=exp-ssh-v2-0001\n (glob)			i> upgrade * proto=exp-ssh-v2-0001\n (glob)
	i> hello\n			i> hello\n
	i> between\n			i> between\n
	i> pairs 81\n			i> pairs 81\n
	i> write(10) -> 10: namespaces			i> write(10) -> 10: namespaces
	i> flush() -> None			i> flush() -> None
	o> bufferedreadline() -> 3:			o> bufferedreadline() -> 3:
	o> 30\n			o> 30\n
	o> bufferedread(30) -> 30:			o> bufferedread(30) -> 30:
	o> bookmarks\t\n			o> bookmarks\t\n
	o> namespaces\t\n			o> namespaces\t\n
	o> phases\t			o> phases\t
	response: b'bookmarks\t\nnamespaces\t\nphases\t'			response: {b'bookmarks': b'', b'namespaces': b'', b'phases': b''}

	$ cd ..			$ cd ..

	Test listkeys for bookmarks			Test listkeys for bookmarks

	$ hg init bookmarkrepo			$ hg init bookmarkrepo
	$ cd bookmarkrepo			$ cd bookmarkrepo
	$ echo 0 > foo			$ echo 0 > foo
	i> write(9) -> 9:			i> write(9) -> 9:
	i> listkeys\n			i> listkeys\n
	i> write(12) -> 12:			i> write(12) -> 12:
	i> namespace 9\n			i> namespace 9\n
	i> write(9) -> 9: bookmarks			i> write(9) -> 9: bookmarks
	i> flush() -> None			i> flush() -> None
	o> bufferedreadline() -> 2:			o> bufferedreadline() -> 2:
	o> 0\n			o> 0\n
	response: b''			response: {}

	testing ssh2			testing ssh2
	creating ssh peer from handshake results			creating ssh peer from handshake results
	i> write(171) -> 171:			i> write(171) -> 171:
	i> upgrade * proto=exp-ssh-v2-0001\n (glob)			i> upgrade * proto=exp-ssh-v2-0001\n (glob)
	i> hello\n			i> hello\n
	i> between\n			i> between\n
	i> pairs 81\n			i> pairs 81\n
	i> write(9) -> 9:			i> write(9) -> 9:
	i> listkeys\n			i> listkeys\n
	i> write(12) -> 12:			i> write(12) -> 12:
	i> namespace 9\n			i> namespace 9\n
	i> write(9) -> 9: bookmarks			i> write(9) -> 9: bookmarks
	i> flush() -> None			i> flush() -> None
	o> bufferedreadline() -> 2:			o> bufferedreadline() -> 2:
	o> 0\n			o> 0\n
	response: b''			response: {}

	With a single bookmark set			With a single bookmark set

	$ hg book -r 0 bookA			$ hg book -r 0 bookA
	$ debugwireproto << EOF			$ debugwireproto << EOF
	> command listkeys			> command listkeys
	> namespace bookmarks			> namespace bookmarks
	> EOF			> EOF
	i> listkeys\n			i> listkeys\n
	i> write(12) -> 12:			i> write(12) -> 12:
	i> namespace 9\n			i> namespace 9\n
	i> write(9) -> 9: bookmarks			i> write(9) -> 9: bookmarks
	i> flush() -> None			i> flush() -> None
	o> bufferedreadline() -> 3:			o> bufferedreadline() -> 3:
	o> 46\n			o> 46\n
	o> bufferedread(46) -> 46: bookA\t68986213bd4485ea51533535e3fc9e78007a711f			o> bufferedread(46) -> 46: bookA\t68986213bd4485ea51533535e3fc9e78007a711f
	response: b'bookA\t68986213bd4485ea51533535e3fc9e78007a711f'			response: {b'bookA': b'68986213bd4485ea51533535e3fc9e78007a711f'}

	testing ssh2			testing ssh2
	creating ssh peer from handshake results			creating ssh peer from handshake results
	i> write(171) -> 171:			i> write(171) -> 171:
	i> upgrade * proto=exp-ssh-v2-0001\n (glob)			i> upgrade * proto=exp-ssh-v2-0001\n (glob)
	i> hello\n			i> hello\n
	i> between\n			i> between\n
	i> pairs 81\n			i> pairs 81\n
	i> listkeys\n			i> listkeys\n
	i> write(12) -> 12:			i> write(12) -> 12:
	i> namespace 9\n			i> namespace 9\n
	i> write(9) -> 9: bookmarks			i> write(9) -> 9: bookmarks
	i> flush() -> None			i> flush() -> None
	o> bufferedreadline() -> 3:			o> bufferedreadline() -> 3:
	o> 46\n			o> 46\n
	o> bufferedread(46) -> 46: bookA\t68986213bd4485ea51533535e3fc9e78007a711f			o> bufferedread(46) -> 46: bookA\t68986213bd4485ea51533535e3fc9e78007a711f
	response: b'bookA\t68986213bd4485ea51533535e3fc9e78007a711f'			response: {b'bookA': b'68986213bd4485ea51533535e3fc9e78007a711f'}

	With multiple bookmarks set			With multiple bookmarks set

	$ hg book -r 1 bookB			$ hg book -r 1 bookB
	$ debugwireproto << EOF			$ debugwireproto << EOF
	> command listkeys			> command listkeys
	> namespace bookmarks			> namespace bookmarks
	> EOF			> EOF
	i> namespace 9\n			i> namespace 9\n
	i> write(9) -> 9: bookmarks			i> write(9) -> 9: bookmarks
	i> flush() -> None			i> flush() -> None
	o> bufferedreadline() -> 3:			o> bufferedreadline() -> 3:
	o> 93\n			o> 93\n
	o> bufferedread(93) -> 93:			o> bufferedread(93) -> 93:
	o> bookA\t68986213bd4485ea51533535e3fc9e78007a711f\n			o> bookA\t68986213bd4485ea51533535e3fc9e78007a711f\n
	o> bookB\t1880f3755e2e52e3199e0ee5638128b08642f34d			o> bookB\t1880f3755e2e52e3199e0ee5638128b08642f34d
	response: b'bookA\t68986213bd4485ea51533535e3fc9e78007a711f\nbookB\t1880f3755e2e52e3199e0ee5638128b08642f34d'			response: {b'bookA': b'68986213bd4485ea51533535e3fc9e78007a711f', b'bookB': b'1880f3755e2e52e3199e0ee5638128b08642f34d'}

	testing ssh2			testing ssh2
	creating ssh peer from handshake results			creating ssh peer from handshake results
	i> write(171) -> 171:			i> write(171) -> 171:
	i> upgrade * proto=exp-ssh-v2-0001\n (glob)			i> upgrade * proto=exp-ssh-v2-0001\n (glob)
	i> hello\n			i> hello\n
	i> between\n			i> between\n
	i> pairs 81\n			i> pairs 81\n
	i> namespace 9\n			i> namespace 9\n
	i> write(9) -> 9: bookmarks			i> write(9) -> 9: bookmarks
	i> flush() -> None			i> flush() -> None
	o> bufferedreadline() -> 3:			o> bufferedreadline() -> 3:
	o> 93\n			o> 93\n
	o> bufferedread(93) -> 93:			o> bufferedread(93) -> 93:
	o> bookA\t68986213bd4485ea51533535e3fc9e78007a711f\n			o> bookA\t68986213bd4485ea51533535e3fc9e78007a711f\n
	o> bookB\t1880f3755e2e52e3199e0ee5638128b08642f34d			o> bookB\t1880f3755e2e52e3199e0ee5638128b08642f34d
	response: b'bookA\t68986213bd4485ea51533535e3fc9e78007a711f\nbookB\t1880f3755e2e52e3199e0ee5638128b08642f34d'			response: {b'bookA': b'68986213bd4485ea51533535e3fc9e78007a711f', b'bookB': b'1880f3755e2e52e3199e0ee5638128b08642f34d'}

	Test pushkey for bookmarks			Test pushkey for bookmarks

	$ debugwireproto << EOF			$ debugwireproto << EOF
	> command pushkey			> command pushkey
	> namespace bookmarks			> namespace bookmarks
	> key remote			> key remote
	> old			> old
	i> write(40) -> 40: 68986213bd4485ea51533535e3fc9e78007a711f			i> write(40) -> 40: 68986213bd4485ea51533535e3fc9e78007a711f
	i> write(6) -> 6:			i> write(6) -> 6:
	i> old 0\n			i> old 0\n
	i> flush() -> None			i> flush() -> None
	o> bufferedreadline() -> 2:			o> bufferedreadline() -> 2:
	o> 2\n			o> 2\n
	o> bufferedread(2) -> 2:			o> bufferedread(2) -> 2:
	o> 1\n			o> 1\n
	response: b'1\n'			response: True

	testing ssh2			testing ssh2
	creating ssh peer from handshake results			creating ssh peer from handshake results
	i> write(171) -> 171:			i> write(171) -> 171:
	i> upgrade * proto=exp-ssh-v2-0001\n (glob)			i> upgrade * proto=exp-ssh-v2-0001\n (glob)
	i> hello\n			i> hello\n
	i> between\n			i> between\n
	i> pairs 81\n			i> pairs 81\n
	i> write(40) -> 40: 68986213bd4485ea51533535e3fc9e78007a711f			i> write(40) -> 40: 68986213bd4485ea51533535e3fc9e78007a711f
	i> write(6) -> 6:			i> write(6) -> 6:
	i> old 0\n			i> old 0\n
	i> flush() -> None			i> flush() -> None
	o> bufferedreadline() -> 2:			o> bufferedreadline() -> 2:
	o> 2\n			o> 2\n
	o> bufferedread(2) -> 2:			o> bufferedread(2) -> 2:
	o> 1\n			o> 1\n
	response: b'1\n'			response: True

	$ hg bookmarks			$ hg bookmarks
	bookA 0:68986213bd44			bookA 0:68986213bd44
	bookB 1:1880f3755e2e			bookB 1:1880f3755e2e
	remote 0:68986213bd44			remote 0:68986213bd44

	$ cd ..			$ cd ..

	i> listkeys\n			i> listkeys\n
	i> write(12) -> 12:			i> write(12) -> 12:
	i> namespace 6\n			i> namespace 6\n
	i> write(6) -> 6: phases			i> write(6) -> 6: phases
	i> flush() -> None			i> flush() -> None
	o> bufferedreadline() -> 3:			o> bufferedreadline() -> 3:
	o> 15\n			o> 15\n
	o> bufferedread(15) -> 15: publishing\tTrue			o> bufferedread(15) -> 15: publishing\tTrue
	response: b'publishing\tTrue'			response: {b'publishing': b'True'}

	testing ssh2			testing ssh2
	creating ssh peer from handshake results			creating ssh peer from handshake results
	i> write(171) -> 171:			i> write(171) -> 171:
	i> upgrade * proto=exp-ssh-v2-0001\n (glob)			i> upgrade * proto=exp-ssh-v2-0001\n (glob)
	i> hello\n			i> hello\n
	i> between\n			i> between\n
	i> pairs 81\n			i> pairs 81\n
	i> listkeys\n			i> listkeys\n
	i> write(12) -> 12:			i> write(12) -> 12:
	i> namespace 6\n			i> namespace 6\n
	i> write(6) -> 6: phases			i> write(6) -> 6: phases
	i> flush() -> None			i> flush() -> None
	o> bufferedreadline() -> 3:			o> bufferedreadline() -> 3:
	o> 15\n			o> 15\n
	o> bufferedread(15) -> 15: publishing\tTrue			o> bufferedread(15) -> 15: publishing\tTrue
	response: b'publishing\tTrue'			response: {b'publishing': b'True'}

	Create some commits			Create some commits

	$ echo 0 > foo			$ echo 0 > foo
	$ hg add foo			$ hg add foo
	$ hg -q commit -m initial			$ hg -q commit -m initial
	$ hg phase --public			$ hg phase --public
	$ echo 1 > foo			$ echo 1 > foo
	i> write(6) -> 6: phases			i> write(6) -> 6: phases
	i> flush() -> None			i> flush() -> None
	o> bufferedreadline() -> 4:			o> bufferedreadline() -> 4:
	o> 101\n			o> 101\n
	o> bufferedread(101) -> 101:			o> bufferedread(101) -> 101:
	o> 20b8a89289d80036e6c4e87c2083e3bea1586637\t1\n			o> 20b8a89289d80036e6c4e87c2083e3bea1586637\t1\n
	o> c4750011d906c18ea2f0527419cbc1a544435150\t1\n			o> c4750011d906c18ea2f0527419cbc1a544435150\t1\n
	o> publishing\tTrue			o> publishing\tTrue
	response: b'20b8a89289d80036e6c4e87c2083e3bea1586637\t1\nc4750011d906c18ea2f0527419cbc1a544435150\t1\npublishing\tTrue'			response: {b'20b8a89289d80036e6c4e87c2083e3bea1586637': b'1', b'c4750011d906c18ea2f0527419cbc1a544435150': b'1', b'publishing': b'True'}

	testing ssh2			testing ssh2
	creating ssh peer from handshake results			creating ssh peer from handshake results
	i> write(171) -> 171:			i> write(171) -> 171:
	i> upgrade * proto=exp-ssh-v2-0001\n (glob)			i> upgrade * proto=exp-ssh-v2-0001\n (glob)
	i> hello\n			i> hello\n
	i> between\n			i> between\n
	i> pairs 81\n			i> pairs 81\n
	i> write(6) -> 6: phases			i> write(6) -> 6: phases
	i> flush() -> None			i> flush() -> None
	o> bufferedreadline() -> 4:			o> bufferedreadline() -> 4:
	o> 101\n			o> 101\n
	o> bufferedread(101) -> 101:			o> bufferedread(101) -> 101:
	o> 20b8a89289d80036e6c4e87c2083e3bea1586637\t1\n			o> 20b8a89289d80036e6c4e87c2083e3bea1586637\t1\n
	o> c4750011d906c18ea2f0527419cbc1a544435150\t1\n			o> c4750011d906c18ea2f0527419cbc1a544435150\t1\n
	o> publishing\tTrue			o> publishing\tTrue
	response: b'20b8a89289d80036e6c4e87c2083e3bea1586637\t1\nc4750011d906c18ea2f0527419cbc1a544435150\t1\npublishing\tTrue'			response: {b'20b8a89289d80036e6c4e87c2083e3bea1586637': b'1', b'c4750011d906c18ea2f0527419cbc1a544435150': b'1', b'publishing': b'True'}

	Single draft head			Single draft head

	$ hg phase --public -r 2			$ hg phase --public -r 2
	$ debugwireproto << EOF			$ debugwireproto << EOF
	> command listkeys			> command listkeys
	> namespace phases			> namespace phases
	> EOF			> EOF
	i> namespace 6\n			i> namespace 6\n
	i> write(6) -> 6: phases			i> write(6) -> 6: phases
	i> flush() -> None			i> flush() -> None
	o> bufferedreadline() -> 3:			o> bufferedreadline() -> 3:
	o> 58\n			o> 58\n
	o> bufferedread(58) -> 58:			o> bufferedread(58) -> 58:
	o> c4750011d906c18ea2f0527419cbc1a544435150\t1\n			o> c4750011d906c18ea2f0527419cbc1a544435150\t1\n
	o> publishing\tTrue			o> publishing\tTrue
	response: b'c4750011d906c18ea2f0527419cbc1a544435150\t1\npublishing\tTrue'			response: {b'c4750011d906c18ea2f0527419cbc1a544435150': b'1', b'publishing': b'True'}

	testing ssh2			testing ssh2
	creating ssh peer from handshake results			creating ssh peer from handshake results
	i> write(171) -> 171:			i> write(171) -> 171:
	i> upgrade * proto=exp-ssh-v2-0001\n (glob)			i> upgrade * proto=exp-ssh-v2-0001\n (glob)
	i> hello\n			i> hello\n
	i> between\n			i> between\n
	i> pairs 81\n			i> pairs 81\n
	i> namespace 6\n			i> namespace 6\n
	i> write(6) -> 6: phases			i> write(6) -> 6: phases
	i> flush() -> None			i> flush() -> None
	o> bufferedreadline() -> 3:			o> bufferedreadline() -> 3:
	o> 58\n			o> 58\n
	o> bufferedread(58) -> 58:			o> bufferedread(58) -> 58:
	o> c4750011d906c18ea2f0527419cbc1a544435150\t1\n			o> c4750011d906c18ea2f0527419cbc1a544435150\t1\n
	o> publishing\tTrue			o> publishing\tTrue
	response: b'c4750011d906c18ea2f0527419cbc1a544435150\t1\npublishing\tTrue'			response: {b'c4750011d906c18ea2f0527419cbc1a544435150': b'1', b'publishing': b'True'}

	All public heads			All public heads

	$ hg phase --public -r 4			$ hg phase --public -r 4
	$ debugwireproto << EOF			$ debugwireproto << EOF
	> command listkeys			> command listkeys
	> namespace phases			> namespace phases
	> EOF			> EOF
	i> listkeys\n			i> listkeys\n
	i> write(12) -> 12:			i> write(12) -> 12:
	i> namespace 6\n			i> namespace 6\n
	i> write(6) -> 6: phases			i> write(6) -> 6: phases
	i> flush() -> None			i> flush() -> None
	o> bufferedreadline() -> 3:			o> bufferedreadline() -> 3:
	o> 15\n			o> 15\n
	o> bufferedread(15) -> 15: publishing\tTrue			o> bufferedread(15) -> 15: publishing\tTrue
	response: b'publishing\tTrue'			response: {b'publishing': b'True'}

	testing ssh2			testing ssh2
	creating ssh peer from handshake results			creating ssh peer from handshake results
	i> write(171) -> 171:			i> write(171) -> 171:
	i> upgrade * proto=exp-ssh-v2-0001\n (glob)			i> upgrade * proto=exp-ssh-v2-0001\n (glob)
	i> hello\n			i> hello\n
	i> between\n			i> between\n
	i> pairs 81\n			i> pairs 81\n
	i> listkeys\n			i> listkeys\n
	i> write(12) -> 12:			i> write(12) -> 12:
	i> namespace 6\n			i> namespace 6\n
	i> write(6) -> 6: phases			i> write(6) -> 6: phases
	i> flush() -> None			i> flush() -> None
	o> bufferedreadline() -> 3:			o> bufferedreadline() -> 3:
	o> 15\n			o> 15\n
	o> bufferedread(15) -> 15: publishing\tTrue			o> bufferedread(15) -> 15: publishing\tTrue
	response: b'publishing\tTrue'			response: {b'publishing': b'True'}

	Setting public phase via pushkey			Setting public phase via pushkey

	$ hg phase --draft --force -r .			$ hg phase --draft --force -r .

	$ debugwireproto << EOF			$ debugwireproto << EOF
	> command pushkey			> command pushkey
	> namespace phases			> namespace phases
	i> write(6) -> 6:			i> write(6) -> 6:
	i> old 1\n			i> old 1\n
	i> write(1) -> 1: 1			i> write(1) -> 1: 1
	i> flush() -> None			i> flush() -> None
	o> bufferedreadline() -> 2:			o> bufferedreadline() -> 2:
	o> 2\n			o> 2\n
	o> bufferedread(2) -> 2:			o> bufferedread(2) -> 2:
	o> 1\n			o> 1\n
	response: b'1\n'			response: True

	testing ssh2			testing ssh2
	creating ssh peer from handshake results			creating ssh peer from handshake results
	i> write(171) -> 171:			i> write(171) -> 171:
	i> upgrade * proto=exp-ssh-v2-0001\n (glob)			i> upgrade * proto=exp-ssh-v2-0001\n (glob)
	i> hello\n			i> hello\n
	i> between\n			i> between\n
	i> pairs 81\n			i> pairs 81\n
	i> write(6) -> 6:			i> write(6) -> 6:
	i> old 1\n			i> old 1\n
	i> write(1) -> 1: 1			i> write(1) -> 1: 1
	i> flush() -> None			i> flush() -> None
	o> bufferedreadline() -> 2:			o> bufferedreadline() -> 2:
	o> 2\n			o> 2\n
	o> bufferedread(2) -> 2:			o> bufferedread(2) -> 2:
	o> 1\n			o> 1\n
	response: b'1\n'			response: True

	$ hg phase .			$ hg phase .
	4: public			4: public

	$ cd ..			$ cd ..

	Test batching of requests			Test batching of requests