# HG changeset patch
# User Raphaël Gomès <rgomes@octobus.net>
# Date 2022-05-30 09:52:31
# Node ID 2012228499872760d17c07d2014ccd2daa0292bc
# Parent  9dad328434c7b36f55951e98e191d10711ae312c

chg: ignore already closed fds when cleaning up

This should fix this error we see in the CI from time to time:

```
--- /tmp/mercurial-ci/tests/test-chg.t
+++ /tmp/mercurial-ci/tests/test-chg.t.err
@@ -187,6 +187,26 @@
   $ chg bulkwrite --pager=on --color no --config ui.formatted=True
   paged! 'going to write massive data\n'
   killed! (?)
+  Traceback (most recent call last):
+    File "/tmp/hgtests._uvojvqb/install/lib/python/mercurial/commandserver.py", line 509, in _serverequest
+      sv.cleanup()
+    File "/tmp/hgtests._uvojvqb/install/lib/python/mercurial/chgserver.py", line 382, in cleanup
+      self._restoreio()
+    File "/tmp/hgtests._uvojvqb/install/lib/python/mercurial/chgserver.py", line 461, in _restoreio
+      os.close(fd)
+  OSError: [Errno 9] Bad file descriptor
+  Traceback (most recent call last):
+    File "/tmp/hgtests._uvojvqb/install/lib/python/mercurial/commandserver.py", line 693, in _acceptnewconnection
+      self._runworker(conn)
+    File "/tmp/hgtests._uvojvqb/install/lib/python/mercurial/commandserver.py", line 744, in _runworker
+      prereposetups=[self._reposetup],
+    File "/tmp/hgtests._uvojvqb/install/lib/python/mercurial/commandserver.py", line 509, in _serverequest
+      sv.cleanup()
+    File "/tmp/hgtests._uvojvqb/install/lib/python/mercurial/chgserver.py", line 382, in cleanup
+      self._restoreio()
+    File "/tmp/hgtests._uvojvqb/install/lib/python/mercurial/chgserver.py", line 461, in _restoreio
+      os.close(fd)
+  OSError: [Errno 9] Bad file descriptor
   [255]
```

diff --git a/mercurial/chgserver.py b/mercurial/chgserver.py
--- a/mercurial/chgserver.py
+++ b/mercurial/chgserver.py
@@ -465,6 +465,7 @@ class chgcmdserver(commandserver.server)
                     os.dup2(nullfd, fp.fileno())
                     fp.flush()
                 os.dup2(fd, fp.fileno())
+                os.close(fd)
             except OSError as err:
                 # According to issue6330, running chg on heavy loaded systems
                 # can lead to EBUSY. [man dup2] indicates that, on Linux,
@@ -477,7 +478,6 @@ class chgcmdserver(commandserver.server)
                     stringutil.forcebytestr(err),
                     fn,
                 )
-            os.close(fd)
             setattr(self, cn, ch)
             setattr(ui, fn, fp)
         os.close(nullfd)