# HG changeset patch # User Laurent Charignon # Date 1453750622 28800 # Node ID 3d3b4ac369f2352a48114a8dd73a25da3766e957 # Parent fedd81659643693d3cd211b3936acd0ffe5e6bdd crecord: fix help bar display issue (issue5063) Before this patch, the help bar in crecord wouldn't be printed correctly when the terminal window didn't have enough column to display it. This patch adds logic to make sure that the help bar message is always displayed. We use an ellipsis when it is not possible to display the complete message. diff -r fedd81659643 -r 3d3b4ac369f2 mercurial/crecord.py --- a/mercurial/crecord.py Mon Jan 25 10:13:03 2016 -0800 +++ b/mercurial/crecord.py Mon Jan 25 11:37:02 2016 -0800 @@ -1010,13 +1010,16 @@ pairname='legend') self.statuswin.refresh() return + line1 = ("SELECT CHUNKS: (j/k/up/dn/pgup/pgdn) move cursor; " + "(space/A) toggle hunk/all; (e)dit hunk;") + line2 = (" (f)old/unfold; (c)onfirm applied; (q)uit; (?) help " + "| [X]=hunk applied **=folded, toggle [a]mend mode") + printstring(self.statuswin, - "SELECT CHUNKS: (j/k/up/dn/pgup/pgdn) move cursor; " - "(space/A) toggle hunk/all; (e)dit hunk;", + util.ellipsis(line1, self.xscreensize - 1), pairname="legend") printstring(self.statuswin, - " (f)old/unfold; (c)onfirm applied; (q)uit; (?) help " - "| [X]=hunk applied **=folded, toggle [a]mend mode", + util.ellipsis(line2, self.xscreensize - 1), pairname="legend") except curses.error: pass