--- a/mercurial/cmdutil.py	Sat Oct 08 00:59:40 2016 +0200
+++ b/mercurial/cmdutil.py	Sat Oct 08 00:59:41 2016 +0200
@@ -499,6 +499,12 @@
     def __getattr__(self, attr):
         return getattr(self._fp, attr)
 
+    def __enter__(self):
+        return self
+
+    def __exit__(self, exc_type, exc_value, exc_tb):
+        pass
+
 def makefileobj(repo, pat, node=None, desc=None, total=None,
                 seqno=None, revwidth=None, mode='wb', modemap=None,
                 pathname=None):