Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/ui.py @ 53023:b12a4b9d09ce
branching: correct merge of stable into default
For unclear reason, b7afc38468bd dropped all the change to
"contrib/heptapod-ci.yml". This is the same merge as b7afc38468bd, but merging
heptapod-ci.yml change from stable too.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 28 Feb 2025 23:18:22 +0100 |
parents | 4cb75772818d b3214b7d2390 |
children |
comparison
equal
deleted
inserted
replaced
52694:bbbb12632607 | 53023:b12a4b9d09ce |
---|---|
260 self.insecureconnections = False | 260 self.insecureconnections = False |
261 # Blocked time | 261 # Blocked time |
262 self.logblockedtimes = False | 262 self.logblockedtimes = False |
263 # color mode: see mercurial/color.py for possible value | 263 # color mode: see mercurial/color.py for possible value |
264 self._colormode = None | 264 self._colormode = None |
265 # readline prompt: is this currently for a readline prompt? | |
266 self._readlineprompt = False | |
265 self._terminfoparams = {} | 267 self._terminfoparams = {} |
266 self._styles = {} | 268 self._styles = {} |
267 self._uninterruptible = False | 269 self._uninterruptible = False |
268 self.showtimestamp = False | 270 self.showtimestamp = False |
269 | 271 |
1739 self._fmsgout, prompt, type=b'prompt', **promptopts | 1741 self._fmsgout, prompt, type=b'prompt', **promptopts |
1740 ) | 1742 ) |
1741 self.flush() | 1743 self.flush() |
1742 prompt = b' ' | 1744 prompt = b' ' |
1743 else: | 1745 else: |
1744 prompt = self.label(prompt, b'ui.prompt') + b' ' | 1746 wasreadlineprompt = self._readlineprompt |
1747 try: | |
1748 self._readlineprompt = True | |
1749 prompt = self.label(prompt, b'ui.prompt') + b' ' | |
1750 finally: | |
1751 self._readlineprompt = wasreadlineprompt | |
1745 | 1752 |
1746 # prompt ' ' must exist; otherwise readline may delete entire line | 1753 # prompt ' ' must exist; otherwise readline may delete entire line |
1747 # - http://bugs.python.org/issue12833 | 1754 # - http://bugs.python.org/issue12833 |
1748 with self.timeblockedsection(b'stdio'): | 1755 with self.timeblockedsection(b'stdio'): |
1749 if usereadline: | 1756 if usereadline: |