diff --git a/mercurial/crecord.py b/mercurial/crecord.py index 838fa1932ff87b4b47a3f7bcb7516910f301d996_bWVyY3VyaWFsL2NyZWNvcmQucHk=..40f0e9e5b821a63db51891a7e456d0c9ff1e2441_bWVyY3VyaWFsL2NyZWNvcmQucHk= 100644 --- a/mercurial/crecord.py +++ b/mercurial/crecord.py @@ -511,6 +511,7 @@ self.ui = ui + self.errorstr = None # list of all chunks self.chunklist = [] for h in headerlist: @@ -976,6 +977,12 @@ # print out the status lines at the top try: + if self.errorstr is not None: + printstring(self.statuswin, self.errorstr, pairname='legend') + printstring(self.statuswin, 'Press any key to continue', + pairname='legend') + self.statuswin.refresh() + return printstring(self.statuswin, "SELECT CHUNKS: (j/k/up/dn/pgup/pgdn) move cursor; " "(space/A) toggle hunk/all; (e)dit hunk;", @@ -1601,6 +1608,9 @@ self.updatescreen() try: keypressed = self.statuswin.getkey() + if self.errorstr is not None: + self.errorstr = None + continue except curses.error: keypressed = "foobar" if self.handlekeypressed(keypressed):