This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9854

histedit: notice when the main window underflows height and abort
ClosedPublic

Authored by durin42 on Jan 22 2021, 3:46 PM.

Details

Reviewers
SimonSapin
pulkit
Group Reviewers
hg-reviewers
Commits
rHGa936e570288d: histedit: notice when the main window underflows height and abort
rHG94247310d2e6: histedit: notice when the main window underflows height and abort
Summary

If you try to have a 13-line-tall terminal and use curses histedit, it
fails by spinning in an infinite loop due to the catch-all ignore of
curses errors on line 1682 of histedit.py. We should also fix that
catch-all ignore of curses errors (what other demons lurk here, I
wonder?) but we can trivially catch this case and guide the user to a
happy path. We've seen this mostly in IDE users that have a tendency
to have really tiny embedded terminal windows.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mhgext/histedit.py (11 lines)

Diff 25297

hgext/histedit.py

def renderpatch(win, state): def renderpatch(win, state):
start = state[b'modes'][MODE_PATCH][b'line_offset'] start = state[b'modes'][MODE_PATCH][b'line_offset']
content = state[b'modes'][MODE_PATCH][b'patchcontents'] content = state[b'modes'][MODE_PATCH][b'patchcontents']
renderstring(win, state, content[start:], diffcolors=True) renderstring(win, state, content[start:], diffcolors=True)
def layout(mode): def layout(mode):
maxy, maxx = stdscr.getmaxyx() maxy, maxx = stdscr.getmaxyx()
helplen = len(helplines(mode)) helplen = len(helplines(mode))
mainlen = maxy - helplen - 12
if mainlen < 1:
raise error.Abort(
_(b"terminal dimensions %d by %d too small for curses histedit")
% (maxy, maxx),
hint=_(
b"enlarge your terminal or use --config ui.interface=text"
),
)
return { return {
b'commit': (12, maxx), b'commit': (12, maxx),
b'help': (helplen, maxx), b'help': (helplen, maxx),
b'main': (maxy - helplen - 12, maxx), b'main': (mainlen, maxx),
} }
def drawvertwin(size, y, x): def drawvertwin(size, y, x):
win = curses.newwin(size[0], size[1], y, x) win = curses.newwin(size[0], size[1], y, x)
y += size[0] y += size[0]
return win, y, x return win, y, x
state = { state = {