# HG changeset patch
# User Manuel Jacob <me@manueljacob.de>
# Date 1594936144 -7200
# Node ID a0791bfd9cfa4390ac83f25a1e25f85a333bfc90
# Parent  aea246bc04bdd52caef8cc43c9e8932fd5deae9d
util: enhance `nullcontextmanager` to be able to return __enter__ result

This makes its functionality and signature equivalent to Python 3.7’s
contextlib.nullcontext().

diff -r aea246bc04bd -r a0791bfd9cfa mercurial/util.py
--- a/mercurial/util.py	Fri Jul 17 03:12:29 2020 +0200
+++ b/mercurial/util.py	Thu Jul 16 23:49:04 2020 +0200
@@ -1381,8 +1381,8 @@
 
 
 @contextlib.contextmanager
-def nullcontextmanager():
-    yield
+def nullcontextmanager(enter_result=None):
+    yield enter_result
 
 
 class _lrucachenode(object):