This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11644

chistedit: move changemode() onto state class
ClosedPublic

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

Details

Reviewers
durin42
pulkit
Group Reviewers
hg-reviewers
Commits
rHG7d2464b6e30b: chistedit: move changemode() 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:05 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: rHG7d2464b6e30b: chistedit: move changemode() onto state class.Oct 13 2021, 6:27 PM
Closed by commit rHG7d2464b6e30b: chistedit: move changemode() 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 (19 lines)

Diff 30784

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 changemode(state, mode):
curmode, _ = state.mode
state.mode = (mode, curmode)
if mode == MODE_PATCH:
state.modes[MODE_PATCH][b'patchcontents'] = state.patch_contents()
def makeselection(state, pos): def makeselection(state, pos):
state.selected = pos state.selected = pos
def swap(state, oldpos, newpos): def swap(state, oldpos, newpos):
"""Swap two positions and calculate necessary conflicts in """Swap two positions and calculate necessary conflicts in
O(|newpos-oldpos|) time""" O(|newpos-oldpos|) time"""
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)))
self.move_cursor(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) self.change_mode(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) self.change_mode(MODE_HELP if curmode != MODE_HELP else prevmode)
elif action == b'quit': elif action == b'quit':
return E_QUIT return E_QUIT
elif action == b'histedit': elif action == b'histedit':
return E_HISTEDIT return E_HISTEDIT
elif action == b'page-down': elif action == b'page-down':
return E_PAGEDOWN return E_PAGEDOWN
elif action == b'page-up': elif action == b'page-up':
return E_PAGEUP return E_PAGEUP
if newpos < modestate[b'line_offset']: if newpos < modestate[b'line_offset']:
modestate[b'line_offset'] = newpos modestate[b'line_offset'] = newpos
elif newpos > modestate[b'line_offset'] + self.page_height - 1: elif newpos > modestate[b'line_offset'] + self.page_height - 1:
modestate[b'line_offset'] = newpos - 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. # Reset the patch view region to the top of the new patch.
self.modes[MODE_PATCH][b'line_offset'] = 0 self.modes[MODE_PATCH][b'line_offset'] = 0
def change_mode(self, mode):
curmode, _ = self.mode
self.mode = (mode, curmode)
if mode == MODE_PATCH:
self.modes[MODE_PATCH][b'patchcontents'] = self.patch_contents()
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
# 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) state.change_mode(MODE_RULES)
e = state.event(ch) e = state.event(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: