##// END OF EJS Templates
httppeer: implement command executor for version 2 peer...
httppeer: implement command executor for version 2 peer Now that we have a new API for issuing commands which is compatible with wire protocol version 2, we can start using it with wire protocol version 2. This commit replaces our hacky implementation of _call() with something a bit more robust based on the new command executor interface. We now have proper support for issuing multiple commands per HTTP request. Each HTTP request maintains its own client reactor. The implementation is similar to the one in the legacy wire protocol. We use a ThreadPoolExecutor for spinning up a thread to read the HTTP response in the background. This allows responses to resolve in any order. While not implemented on the server yet, a client could use concurrent.futures.as_completed() with a collection of futures and handle responses as they arrive from the server. The return value from issued commands is still a simple list of raw or decoded CBOR data. This is still super hacky. We will want a rich data type for representing command responses. But at least this commit gets us one step closer to a proper peer implementation. Differential Revision: https://phab.mercurial-scm.org/D3297

File last commit:

r37290:7d3bc1d4 default
r37669:950294e2 default
Show More
test-template-engine.t
64 lines | 1.8 KiB | text/troff | Tads3Lexer
/ tests / test-template-engine.t
Matt Mackall
tests: unify test-template-engine
r12493
$ cat > engine.py << EOF
>
Yuya Nishihara
templater: move stringify() to templateutil module...
r36938 > from mercurial import (
Yuya Nishihara
py3: make test-template-engine.t bytes-safe
r36988 > pycompat,
Yuya Nishihara
templater: move stringify() to templateutil module...
r36938 > templater,
> templateutil,
> )
Matt Mackall
tests: unify test-template-engine
r12493 >
Yuya Nishihara
test-template-engine: deduplicate methods of custom template engine
r36987 > class mytemplater(templater.engine):
> def _load(self, t):
> return self._loader(t)
Yuya Nishihara
templatekw: add 'requires' flag to switch to exception-safe interface...
r36463 >
Matt Mackall
tests: unify test-template-engine
r12493 > def process(self, t, map):
Yuya Nishihara
test-template-engine: deduplicate methods of custom template engine
r36987 > tmpl = self._load(t)
Yuya Nishihara
templater: register keywords to defaults table...
r35499 > props = self._defaults.copy()
> props.update(map)
Pulkit Goyal
py3: use dict.items() instead of dict.iteritems() in tests...
r36345 > for k, v in props.items():
Yuya Nishihara
test-template-engine: do not evaluate unused keywords by custom engine...
r36989 > if b'{{%s}}' % k not in tmpl:
Matt Mackall
tests: unify test-template-engine
r12493 > continue
Yuya Nishihara
templatekw: add 'requires' flag to switch to exception-safe interface...
r36463 > if callable(v) and getattr(v, '_requires', None) is None:
Yuya Nishihara
templater: keep default resources per template engine (API)...
r35484 > props = self._resources.copy()
> props.update(map)
Yuya Nishihara
py3: make test-template-engine.t bytes-safe
r36988 > v = v(**pycompat.strkwargs(props))
Yuya Nishihara
templatekw: add 'requires' flag to switch to exception-safe interface...
r36463 > elif callable(v):
> v = v(self, props)
Yuya Nishihara
templater: pass (context, mapping) down to unwraphybrid()...
r37290 > v = templateutil.stringify(self, props, v)
Yuya Nishihara
py3: make test-template-engine.t bytes-safe
r36988 > tmpl = tmpl.replace(b'{{%s}}' % k, v)
Matt Mackall
tests: unify test-template-engine
r12493 > yield tmpl
>
Yuya Nishihara
py3: make test-template-engine.t bytes-safe
r36988 > templater.engines[b'my'] = mytemplater
Matt Mackall
tests: unify test-template-engine
r12493 > EOF
$ hg init test
$ echo '[extensions]' > test/.hg/hgrc
$ echo "engine = `pwd`/engine.py" >> test/.hg/hgrc
$ cd test
$ cat > mymap << EOF
> changeset = my:changeset.txt
> EOF
$ cat > changeset.txt << EOF
> {{rev}} {{node}} {{author}}
> EOF
$ hg ci -Ama
adding changeset.txt
adding mymap
$ hg log --style=./mymap
0 97e5f848f0936960273bbf75be6388cd0350a32b test
Mads Kiilerich
tests: add missing trailing 'cd ..'...
r16913
epriestley
templatekw: add parent1, parent1node, parent2, parent2node keywords...
r17355 $ cat > changeset.txt << EOF
Bryan O'Sullivan
templatekw: merge, preferring the second implementation
r17358 > {{p1rev}} {{p1node}} {{p2rev}} {{p2node}}
epriestley
templatekw: add parent1, parent1node, parent2, parent2node keywords...
r17355 > EOF
$ hg ci -Ama
$ hg log --style=./mymap
0 97e5f848f0936960273bbf75be6388cd0350a32b -1 0000000000000000000000000000000000000000
-1 0000000000000000000000000000000000000000 -1 0000000000000000000000000000000000000000
Yuya Nishihara
templater: give better error message for invalid engine type...
r28831 invalid engine type:
$ echo 'changeset = unknown:changeset.txt' > unknownenginemap
$ hg log --style=./unknownenginemap
abort: invalid template engine: unknown
[255]
Mads Kiilerich
tests: add missing trailing 'cd ..'...
r16913 $ cd ..