Mercurial > public > mercurial-scm > hg-stable
view tests/test-extensions-wrapfunction.py.out @ 48472:38941a28406a
mergestate: merge `preresolve()` into `resolve()`
The separation between `preresolve()` and `resolve()` was something
added for the "merge driver" feature. Since we removed that in
32ce4cbaec4b (mergedriver: delete it, 2020-09-17), we don't need the
separation anymore. More cleanups will follow.
Differential Revision: https://phab.mercurial-scm.org/D11855
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 02 Dec 2021 22:59:36 -0800 |
| parents | 82bd4c5a81e5 |
| children |
line wrap: on
line source
wrap 0: [0, 'orig'] wrap 1: [1, 0, 'orig'] wrap 2: [2, 1, 0, 'orig'] wrap 3: [3, 2, 1, 0, 'orig'] wrap 4: [4, 3, 2, 1, 0, 'orig'] wrap 0: [0, 4, 3, 2, 1, 0, 'orig'] unwrap 3: 3: [0, 4, 2, 1, 0, 'orig'] unwrap -: 0: [4, 2, 1, 0, 'orig'] unwrap 0: 0: [4, 2, 1, 'orig'] unwrap 4: 4: [2, 1, 'orig'] unwrap 0: -: ValueError unwrap 2: 2: [1, 'orig'] unwrap 1: 1: ['orig'] unwrap -: -: IndexError context manager ['orig'] context manager [1, 'orig'] context manager [0, 1, 'orig'] context manager [2, 0, 1, 'orig'] context manager [2, 1, 'orig'] context manager [2, 'orig'] wrap callable object [0, 'orig']