( )⚙ D11643 chistedit: move movecursor() onto state class

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11643

chistedit: move movecursor() onto state class
ClosedPublic

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

Details

Reviewers
durin42
pulkit
Group Reviewers
hg-reviewers
Commits
rHGfb30ad66a572: chistedit: move movecursor() onto state class

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

martinvonz created this revision.Oct 12 2021, 1:04 PM
pulkit accepted this revision.Oct 13 2021, 3:01 PM
This revision is now accepted and ready to land.Oct 13 2021, 3:01 PM
martinvonz added a commit: rHGfb30ad66a572: chistedit: move movecursor() onto state class.Oct 13 2021, 6:27 PM
Closed by commit rHGfb30ad66a572: chistedit: move movecursor() onto state class (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/histedit.py (47 lines)

Diff 30731

hgext/histedit.py

return self.conflicts return self.conflicts
if other in self.conflicts: if other in self.conflicts:
self.conflicts.remove(other) self.conflicts.remove(other)
return self.conflicts return self.conflicts
# ============ EVENTS =============== # ============ EVENTS ===============
def movecursor(state, oldpos, newpos):
"""Change the rule/changeset that the cursor is pointing to, regardless of
current mode (you can switch between patches from the view patch window)."""
state.pos = newpos
mode, _ = state.mode
if mode == MODE_RULES:
# Scroll through the list by updating the view for MODE_RULES, so that
# even if we are not currently viewing the rules, switching back will
# result in the cursor's rule being visible.
modestate = state.modes[MODE_RULES]
if newpos < modestate[b'line_offset']:
modestate[b'line_offset'] = newpos
elif newpos > modestate[b'line_offset'] + state.page_height - 1:
modestate[b'line_offset'] = newpos - state.page_height + 1
# Reset the patch view region to the top of the new patch.
state.modes[MODE_PATCH][b'line_offset'] = 0
def changemode(state, mode): def changemode(state, mode):
curmode, _ = state.mode curmode, _ = state.mode
state.mode = (mode, curmode) state.mode = (mode, curmode)
if mode == MODE_PATCH: if mode == MODE_PATCH:
state.modes[MODE_PATCH][b'patchcontents'] = state.patch_contents() state.modes[MODE_PATCH][b'patchcontents'] = state.patch_contents()
def makeselection(state, pos): def makeselection(state, pos):
curmode, prevmode = self.mode curmode, prevmode = self.mode
action = KEYTABLE[curmode].get( action = KEYTABLE[curmode].get(
lookup_ch, KEYTABLE[b'global'].get(lookup_ch) lookup_ch, KEYTABLE[b'global'].get(lookup_ch)
) )
if action is None: if action is None:
return return
if action in (b'down', b'move-down'): if action in (b'down', b'move-down'):
newpos = min(oldpos + 1, len(rules) - 1) newpos = min(oldpos + 1, len(rules) - 1)
movecursor(self, oldpos, newpos) self.move_cursor(oldpos, newpos)
if selected is not None or action == b'move-down': if selected is not None or action == b'move-down':
swap(self, oldpos, newpos) swap(self, oldpos, newpos)
elif action in (b'up', b'move-up'): elif action in (b'up', b'move-up'):
newpos = max(0, oldpos - 1) newpos = max(0, oldpos - 1)
movecursor(self, oldpos, newpos) self.move_cursor(oldpos, newpos)
if selected is not None or action == b'move-up': if selected is not None or action == b'move-up':
swap(self, oldpos, newpos) swap(self, oldpos, newpos)
elif action == b'next-action': elif action == b'next-action':
cycleaction(self, oldpos, next=True) cycleaction(self, oldpos, next=True)
elif action == b'prev-action': elif action == b'prev-action':
cycleaction(self, oldpos, next=False) cycleaction(self, oldpos, next=False)
elif action == b'select': elif action == b'select':
selected = oldpos if selected is None else None selected = oldpos if selected is None else None
makeselection(self, selected) makeselection(self, selected)
elif action == b'goto' and int(ch) < len(rules) and len(rules) <= 10: elif action == b'goto' and int(ch) < len(rules) and len(rules) <= 10:
newrule = next((r for r in rules if r.origpos == int(ch))) newrule = next((r for r in rules if r.origpos == int(ch)))
movecursor(self, oldpos, newrule.pos) self.move_cursor(oldpos, newrule.pos)
if selected is not None: if selected is not None:
swap(self, oldpos, newrule.pos) swap(self, oldpos, newrule.pos)
elif action.startswith(b'action-'): elif action.startswith(b'action-'):
changeaction(self, oldpos, action[7:]) changeaction(self, oldpos, action[7:])
elif action == b'showpatch': elif action == b'showpatch':
changemode(self, MODE_PATCH if curmode != MODE_PATCH else prevmode) changemode(self, MODE_PATCH if curmode != MODE_PATCH else prevmode)
elif action == b'help': elif action == b'help':
changemode(self, MODE_HELP if curmode != MODE_HELP else prevmode) changemode(self, MODE_HELP if curmode != MODE_HELP else prevmode)
buffered=True, buffered=True,
) )
overrides = {(b'ui', b'verbose'): True} overrides = {(b'ui', b'verbose'): True}
with repo.ui.configoverride(overrides, source=b'histedit'): with repo.ui.configoverride(overrides, source=b'histedit'):
displayer.show(rule.ctx) displayer.show(rule.ctx)
displayer.close() displayer.close()
return displayer.hunk[rule.ctx.rev()].splitlines() return displayer.hunk[rule.ctx.rev()].splitlines()
def move_cursor(self, oldpos, newpos):
"""Change the rule/changeset that the cursor is pointing to, regardless of
current mode (you can switch between patches from the view patch window)."""
self.pos = newpos
mode, _ = self.mode
if mode == MODE_RULES:
# Scroll through the list by updating the view for MODE_RULES, so that
# even if we are not currently viewing the rules, switching back will
# result in the cursor's rule being visible.
modestate = self.modes[MODE_RULES]
if newpos < modestate[b'line_offset']:
modestate[b'line_offset'] = newpos
elif newpos > modestate[b'line_offset'] + self.page_height - 1:
modestate[b'line_offset'] = newpos - self.page_height + 1
# Reset the patch view region to the top of the new patch.
self.modes[MODE_PATCH][b'line_offset'] = 0
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
if size != stdscr.getmaxyx(): if size != stdscr.getmaxyx():
curses.resizeterm(*size) curses.resizeterm(*size)
sizes = state.layout() sizes = state.layout()
curmode, unused = state.mode curmode, unused = state.mode
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) state.move_cursor(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)
helpwin, y, x = drawvertwin(sizes[b'help'], y, x) helpwin, y, x = drawvertwin(sizes[b'help'], y, x)
mainwin, y, x = drawvertwin(sizes[b'main'], y, x) mainwin, y, x = drawvertwin(sizes[b'main'], y, x)
commitwin, y, x = drawvertwin(sizes[b'commit'], y, x) commitwin, y, x = drawvertwin(sizes[b'commit'], y, x)