Mercurial > public > mercurial-scm > hg-stable
view tests/testlib/ext-stream-clone-steps.py @ 48607:07069fcd9a6e
filemerge: work with `simplemerge.MergeInput` in `filemerge()`
We currently pass around pairs of file context objects and labels
between functions in the `filemerge` module. I plan to pass around
`simplemerge.MergeInput` instead. This patch prepares for that by
using the type internally in `filemerge.filemerge()`.
Differential Revision: https://phab.mercurial-scm.org/D12017
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 20 Jan 2022 14:42:50 -0800 |
parents | faa43f09ad98 |
children | 6000f5b25c9b |
line wrap: on
line source
from __future__ import absolute_import from mercurial import ( encoding, extensions, streamclone, testing, ) WALKED_FILE_1 = encoding.environ[b'HG_TEST_STREAM_WALKED_FILE_1'] WALKED_FILE_2 = encoding.environ[b'HG_TEST_STREAM_WALKED_FILE_2'] def _test_sync_point_walk_1(orig, repo): testing.write_file(WALKED_FILE_1) def _test_sync_point_walk_2(orig, repo): assert repo._currentlock(repo._lockref) is None testing.wait_file(WALKED_FILE_2) def uisetup(ui): extensions.wrapfunction( streamclone, '_test_sync_point_walk_1', _test_sync_point_walk_1 ) extensions.wrapfunction( streamclone, '_test_sync_point_walk_2', _test_sync_point_walk_2 )