# HG changeset patch
# User Manuel Jacob <me@manueljacob.de>
# Date 2020-07-16 21:49:04
# 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 --git a/mercurial/util.py b/mercurial/util.py
--- a/mercurial/util.py
+++ b/mercurial/util.py
@@ -1381,8 +1381,8 @@ def acceptintervention(tr=None):
 
 
 @contextlib.contextmanager
-def nullcontextmanager():
-    yield
+def nullcontextmanager(enter_result=None):
+    yield enter_result
 
 
 class _lrucachenode(object):