This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11638

chistedit: move layout() and dependencies onto state class
ClosedPublic

Authored by martinvonz on Oct 12 2021, 1:04 PM.

Details

Reviewers
durin42
pulkit
Group Reviewers
hg-reviewers
Commits
rHG9006eafa0942: chistedit: move layout() and dependencies onto state class

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.

Event Timeline

martinvonz created this revision.Oct 12 2021, 1:04 PM
pulkit accepted this revision.Oct 13 2021, 2:49 PM
This revision is now accepted and ready to land.Oct 13 2021, 2:49 PM

Revision Contents
Changeset List

PathPackages
Mhgext/histedit.py (89 lines)

Diff 30778

hgext/histedit.py

return displayer.hunk[rule.ctx.rev()].splitlines() return displayer.hunk[rule.ctx.rev()].splitlines()
class _chistedit_state(object): class _chistedit_state(object):
def __init__( def __init__(
self, self,
repo, repo,
rules, rules,
stdscr,
): ):
self.repo = repo self.repo = repo
self.rules = rules self.rules = rules
self.stdscr = stdscr
self.pos = 0 self.pos = 0
self.selected = None self.selected = None
self.mode = (MODE_INIT, MODE_INIT) self.mode = (MODE_INIT, MODE_INIT)
self.page_height = None self.page_height = None
self.modes = { self.modes = {
MODE_RULES: { MODE_RULES: {
b'line_offset': 0, b'line_offset': 0,
}, },
conflictstr = b','.join(map(lambda r: r.ctx.hex()[:12], conflicts)) conflictstr = b','.join(map(lambda r: r.ctx.hex()[:12], conflicts))
conflictstr = b"changed files overlap with %s" % conflictstr conflictstr = b"changed files overlap with %s" % conflictstr
else: else:
conflictstr = b'no overlap' conflictstr = b'no overlap'
win.addstr(y, 1, conflictstr[:length]) win.addstr(y, 1, conflictstr[:length])
win.noutrefresh() win.noutrefresh()
def helplines(self):
if self.mode[0] == MODE_PATCH:
help = b"""\
?: help, k/up: line up, j/down: line down, v: stop viewing patch
pgup: prev page, space/pgdn: next page, c: commit, q: abort
"""
else:
help = b"""\
?: help, k/up: move up, j/down: move down, space: select, v: view patch
d: drop, e: edit, f: fold, m: mess, p: pick, r: roll
pgup/K: move patch up, pgdn/J: move patch down, c: commit, q: abort
"""
return help.splitlines()
def render_help(self, win):
maxy, maxx = win.getmaxyx()
for y, line in enumerate(self.helplines()):
if y >= maxy:
break
addln(win, y, 0, line, curses.color_pair(COLOR_HELP))
win.noutrefresh()
def layout(self):
maxy, maxx = self.stdscr.getmaxyx()
helplen = len(self.helplines())
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 {
b'commit': (12, maxx),
b'help': (helplen, maxx),
b'main': (mainlen, maxx),
}
def _chisteditmain(repo, rules, stdscr): def _chisteditmain(repo, rules, stdscr):
try: try:
curses.use_default_colors() curses.use_default_colors()
except curses.error: except curses.error:
pass pass
# initialize color pattern # initialize color pattern
curses.init_pair(COLOR_ROLL_SELECTED, curses.COLOR_RED, curses.COLOR_WHITE) curses.init_pair(COLOR_ROLL_SELECTED, curses.COLOR_RED, curses.COLOR_WHITE)
# don't display the cursor # don't display the cursor
try: try:
curses.curs_set(0) curses.curs_set(0)
except curses.error: except curses.error:
pass pass
def helplines(mode):
if mode == MODE_PATCH:
help = b"""\
?: help, k/up: line up, j/down: line down, v: stop viewing patch
pgup: prev page, space/pgdn: next page, c: commit, q: abort
"""
else:
help = b"""\
?: help, k/up: move up, j/down: move down, space: select, v: view patch
d: drop, e: edit, f: fold, m: mess, p: pick, r: roll
pgup/K: move patch up, pgdn/J: move patch down, c: commit, q: abort
"""
return help.splitlines()
def renderhelp(win, state):
maxy, maxx = win.getmaxyx()
mode, _ = state.mode
for y, line in enumerate(helplines(mode)):
if y >= maxy:
break
addln(win, y, 0, line, curses.color_pair(COLOR_HELP))
win.noutrefresh()
def renderrules(rulesscr, state): def renderrules(rulesscr, state):
rules = state.rules rules = state.rules
pos = state.pos pos = state.pos
selected = state.selected selected = state.selected
start = state.modes[MODE_RULES][b'line_offset'] start = state.modes[MODE_RULES][b'line_offset']
conflicts = [r.ctx for r in rules if r.conflicts] conflicts = [r.ctx for r in rules if r.conflicts]
if len(conflicts) > 0: if len(conflicts) > 0:
win.addstr(y, 0, line) win.addstr(y, 0, line)
win.noutrefresh() win.noutrefresh()
def renderpatch(win, state): def renderpatch(win, state):
start = state.modes[MODE_PATCH][b'line_offset'] start = state.modes[MODE_PATCH][b'line_offset']
content = state.modes[MODE_PATCH][b'patchcontents'] content = state.modes[MODE_PATCH][b'patchcontents']
renderstring(win, state, content[start:], diffcolors=True) renderstring(win, state, content[start:], diffcolors=True)
def layout(mode):
maxy, maxx = stdscr.getmaxyx()
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 {
b'commit': (12, maxx),
b'help': (helplen, 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 = _chistedit_state(repo, rules) state = _chistedit_state(repo, rules, stdscr)
# eventloop # eventloop
ch = None ch = None
stdscr.clear() stdscr.clear()
stdscr.refresh() stdscr.refresh()
while True: while True:
oldmode, unused = state.mode oldmode, unused = state.mode
if oldmode == MODE_INIT: if oldmode == MODE_INIT:
changemode(state, MODE_RULES) changemode(state, MODE_RULES)
e = event(state, ch) e = event(state, ch)
if e == E_QUIT: if e == E_QUIT:
return False return False
if e == E_HISTEDIT: if e == E_HISTEDIT:
return state.rules return state.rules
else: else:
if e == E_RESIZE: if e == E_RESIZE:
size = screen_size() size = screen_size()
if size != stdscr.getmaxyx(): if size != stdscr.getmaxyx():
curses.resizeterm(*size) curses.resizeterm(*size)
sizes = state.layout()
curmode, unused = state.mode curmode, unused = state.mode
sizes = layout(curmode)
if curmode != oldmode: if curmode != oldmode:
state.page_height = sizes[b'main'][0] state.page_height = sizes[b'main'][0]
# Adjust the view to fit the current screen size. # Adjust the view to fit the current screen size.
movecursor(state, state.pos, state.pos) movecursor(state, state.pos, state.pos)
# Pack the windows against the top, each pane spread across the # Pack the windows against the top, each pane spread across the
# full width of the screen. # full width of the screen.
y, x = (0, 0) y, x = (0, 0)
mainwin.erase() mainwin.erase()
if curmode == MODE_PATCH: if curmode == MODE_PATCH:
renderpatch(mainwin, state) renderpatch(mainwin, state)
elif curmode == MODE_HELP: elif curmode == MODE_HELP:
renderstring(mainwin, state, __doc__.strip().splitlines()) renderstring(mainwin, state, __doc__.strip().splitlines())
else: else:
renderrules(mainwin, state) renderrules(mainwin, state)
state.render_commit(commitwin) state.render_commit(commitwin)
renderhelp(helpwin, state) state.render_help(helpwin)
curses.doupdate() curses.doupdate()
# done rendering # done rendering
ch = encoding.strtolocal(stdscr.getkey()) ch = encoding.strtolocal(stdscr.getkey())
def _chistedit(ui, repo, freeargs, opts): def _chistedit(ui, repo, freeargs, opts):
"""interactively edit changeset history via a curses interface """interactively edit changeset history via a curses interface