diff -r b4694ef45db5 -r 4b4160a83303 mercurial/chgserver.py --- a/mercurial/chgserver.py Mon Nov 16 15:11:51 2020 -0800 +++ b/mercurial/chgserver.py Mon Nov 16 16:00:13 2020 -0800 @@ -62,6 +62,7 @@ extensions, node, pycompat, + scmutil, util, ) @@ -503,13 +504,11 @@ list, the client can continue with this server after completing all the instructions. """ - from . import dispatch # avoid cycle - args = self._readlist() try: self.ui, lui = _loadnewui(self.ui, args, self.cdebug) except error.ParseError as inst: - dispatch._formatparse(self.ui.warn, inst) + scmutil.formatparse(self.ui.warn, inst) self.ui.flush() self.cresult.write(b'exit 255') return