##// 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:

r37946:76d0a343 default
r39595:07b58266 default
Show More
test-ui-verbosity.py
55 lines | 1.5 KiB | text/x-python | PythonLexer
/ tests / test-ui-verbosity.py
Pulkit Goyal
py3: make test-ui-verbosity use absolute_import
r28679 from __future__ import absolute_import, print_function
Pulkit Goyal
py3: make test-ui-verbosity use print_function
r28678
Martin Geisler
tests: renamed Python tests to .py
r8449 import os
Yuya Nishihara
tests: alias ui as uimod in test-revlog-ancestry/test-ui-verbosity
r28842 from mercurial import (
Pulkit Goyal
py3: use range instead of xrange on py3 in tests/test-ui-verbosity.py...
r36308 pycompat,
Yuya Nishihara
tests: alias ui as uimod in test-revlog-ancestry/test-ui-verbosity
r28842 ui as uimod,
)
Martin Geisler
tests: renamed Python tests to .py
r8449
Pulkit Goyal
py3: use range instead of xrange on py3 in tests/test-ui-verbosity.py...
r36308 if pycompat.ispy3:
xrange = range
Martin Geisler
tests: renamed Python tests to .py
r8449 hgrc = os.environ['HGRCPATH']
f = open(hgrc)
basehgrc = f.read()
f.close()
Pulkit Goyal
py3: make test-ui-verbosity use print_function
r28678 print(' hgrc settings command line options final result ')
print(' quiet verbo debug quiet verbo debug quiet verbo debug')
Martin Geisler
tests: renamed Python tests to .py
r8449
for i in xrange(64):
hgrc_quiet = bool(i & 1<<0)
hgrc_verbose = bool(i & 1<<1)
hgrc_debug = bool(i & 1<<2)
cmd_quiet = bool(i & 1<<3)
cmd_verbose = bool(i & 1<<4)
cmd_debug = bool(i & 1<<5)
f = open(hgrc, 'w')
f.write(basehgrc)
f.write('\n[ui]\n')
if hgrc_quiet:
f.write('quiet = True\n')
if hgrc_verbose:
f.write('verbose = True\n')
if hgrc_debug:
f.write('debug = True\n')
f.close()
Yuya Nishihara
ui: factor out ui.load() to create a ui without loading configs (API)...
r30559 u = uimod.ui.load()
Martin Geisler
tests: renamed Python tests to .py
r8449 if cmd_quiet or cmd_debug or cmd_verbose:
Augie Fackler
tests: port test-ui-verbosity.py to Python 3...
r37946 u.setconfig(b'ui', b'quiet', pycompat.bytestr(bool(cmd_quiet)))
u.setconfig(b'ui', b'verbose', pycompat.bytestr(bool(cmd_verbose)))
u.setconfig(b'ui', b'debug', pycompat.bytestr(bool(cmd_debug)))
Martin Geisler
tests: renamed Python tests to .py
r8449
check = ''
if u.debugflag:
if not u.verbose or u.quiet:
check = ' *'
elif u.verbose and u.quiet:
check = ' +'
Pulkit Goyal
py3: make test-ui-verbosity use print_function
r28678 print(('%2d %5s %5s %5s %5s %5s %5s -> %5s %5s %5s%s'
Martin Geisler
tests: renamed Python tests to .py
r8449 % (i, hgrc_quiet, hgrc_verbose, hgrc_debug,
cmd_quiet, cmd_verbose, cmd_debug,
Pulkit Goyal
py3: make test-ui-verbosity use print_function
r28678 u.quiet, u.verbose, u.debugflag, check)))