From e76eafca3903052169c79b2fdb4c4ff801b3852d Mon Sep 17 00:00:00 2001
From: Jun Wu <quark@fb.com>
Date: Fri, 17 Jul 2020 12:11:24 -0700
Subject: [PATCH] chgserver: do not save or restore io

Summary:
It's not needed as chgserver forks per request.

This avoids potential EBUSY issues:

  File "chgserver.py", line 267, in _restoreio
    os.dup2(fd, fp.fileno())
  OSError: [Errno 16] Device or resource busy

Reviewed By: DurhamG

Differential Revision: D22534976

fbshipit-source-id: 3e673a7366d1cb060670260ff0b2f5864b75a22d
---
 eden/scm/edenscm/mercurial/chgserver.py | 34 +++----------------------
 1 file changed, 3 insertions(+), 31 deletions(-)

diff --git a/eden/scm/edenscm/mercurial/chgserver.py b/eden/scm/edenscm/mercurial/chgserver.py
index 192ea1aaff..23a30e8fae 100644
--- a/eden/scm/edenscm/mercurial/chgserver.py
+++ b/eden/scm/edenscm/mercurial/chgserver.py
@@ -187,7 +187,7 @@ class chgcmdserver(commandserver.server):
             _newchgui(ui, channeledsystem(fin, fout), self.attachio), repo, fin, fout
         )
         self.clientsock = sock
-        self._oldios = []  # original (self.ch, ui.fp, fd) before "attachio"
+        self._ioattached = False
         self.baseaddress = baseaddress
 
     def cleanup(self):
@@ -195,7 +195,6 @@ class chgcmdserver(commandserver.server):
         # dispatch._runcatch() does not flush outputs if exception is not
         # handled by dispatch._dispatch()
         self.ui.flush()
-        self._restoreio()
 
     def attachio(self):
         # type: () -> None
@@ -210,7 +209,7 @@ class chgcmdserver(commandserver.server):
 
         ui = self.ui
         ui.flush()
-        first = self._saveio()
+        first = not self._ioattached
         for fd, (cn, fn, mode) in zip(clientfds, _iochannels):
             assert fd > 0
             fp = getattr(ui, fn)
@@ -241,34 +240,7 @@ class chgcmdserver(commandserver.server):
             setattr(self, cn, newfp)
 
         self.cresult.write(struct.pack(">i", len(clientfds)))
-
-    def _saveio(self):
-        # type: () -> bool
-        if self._oldios:
-            return False
-        ui = self.ui
-        for cn, fn, _mode in _iochannels:
-            ch = getattr(self, cn)
-            fp = getattr(ui, fn)
-            fd = os.dup(fp.fileno())
-            self._oldios.append((ch, fp, fd))
-        return True
-
-    def _restoreio(self):
-        # type: () -> None
-        ui = self.ui
-        for (ch, fp, fd), (cn, fn, _mode) in zip(self._oldios, _iochannels):
-            newfp = getattr(ui, fn)
-            # close newfp while it's associated with client; otherwise it
-            # would be closed when newfp is deleted
-            if newfp is not fp:
-                newfp.close()
-            # restore original fd: fp is open again
-            os.dup2(fd, fp.fileno())
-            os.close(fd)
-            setattr(self, cn, ch)
-            setattr(ui, fn, fp)
-        del self._oldios[:]
+        self._ioattached = True
 
     def chdir(self):
         # type: () -> None