comparison mercurial/ui.py @ 45758:14ac6a74e7e7 stable

ui: fix echo back of ui.prompt() to not concatenate None as bytes

Spotted while writing tests for the issue6425. The default value may be
None.

45757:067707e026b4

        try:
            r = self._readline(prompt=msg, promptopts=opts)
            if not r:
                r = default
            if self.configbool(b'ui', b'promptecho'):
                self._writemsg(self._fmsgout, r, b"\n", type=b'promptecho')
            return r
        except EOFError:
            raise error.ResponseExpected()

    @staticmethod

45758:14ac6a74e7e7

        try:
            r = self._readline(prompt=msg, promptopts=opts)
            if not r:
                r = default
            if self.configbool(b'ui', b'promptecho'):
                self._writemsg(
                    self._fmsgout, r or b'', b"\n", type=b'promptecho'
                )
            return r
        except EOFError:
            raise error.ResponseExpected()

    @staticmethod