( )⚙ D11646 chistedit: move swap() onto state class

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11646

chistedit: move swap() onto state class
ClosedPublic

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

Details

Reviewers
durin42
pulkit
Group Reviewers
hg-reviewers
Commits
rHG0444956ecbcf: chistedit: move swap() 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:05 PM
pulkit accepted this revision.Oct 13 2021, 3:08 PM
This revision is now accepted and ready to land.Oct 13 2021, 3:08 PM
martinvonz added a commit: rHG0444956ecbcf: chistedit: move swap() onto state class.Oct 13 2021, 6:27 PM
Closed by commit rHG0444956ecbcf: chistedit: move swap() 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 (51 lines)

Diff 30734

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 swap(state, oldpos, newpos):
"""Swap two positions and calculate necessary conflicts in
O(|newpos-oldpos|) time"""
rules = state.rules
assert 0 <= oldpos < len(rules) and 0 <= newpos < len(rules)
rules[oldpos], rules[newpos] = rules[newpos], rules[oldpos]
# TODO: swap should not know about histeditrule's internals
rules[newpos].pos = newpos
rules[oldpos].pos = oldpos
start = min(oldpos, newpos)
end = max(oldpos, newpos)
for r in pycompat.xrange(start, end + 1):
rules[newpos].checkconflicts(rules[r])
rules[oldpos].checkconflicts(rules[r])
if state.selected:
state.make_selection(newpos)
def changeaction(state, pos, action): def changeaction(state, pos, action):
"""Change the action state on the given position to the new action""" """Change the action state on the given position to the new action"""
rules = state.rules rules = state.rules
assert 0 <= pos < len(rules) assert 0 <= pos < len(rules)
rules[pos].action = action rules[pos].action = action
def cycleaction(state, pos, next=False): def cycleaction(state, pos, next=False):
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)
self.move_cursor(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) self.swap(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)
self.move_cursor(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) self.swap(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
self.make_selection(selected) self.make_selection(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)))
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) self.swap(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':
self.change_mode(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':
self.change_mode(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
curmode, _ = self.mode curmode, _ = self.mode
self.mode = (mode, curmode) self.mode = (mode, curmode)
if mode == MODE_PATCH: if mode == MODE_PATCH:
self.modes[MODE_PATCH][b'patchcontents'] = self.patch_contents() self.modes[MODE_PATCH][b'patchcontents'] = self.patch_contents()
def make_selection(self, pos): def make_selection(self, pos):
self.selected = pos self.selected = pos
def swap(self, oldpos, newpos):
"""Swap two positions and calculate necessary conflicts in
O(|newpos-oldpos|) time"""
rules = self.rules
assert 0 <= oldpos < len(rules) and 0 <= newpos < len(rules)
rules[oldpos], rules[newpos] = rules[newpos], rules[oldpos]
# TODO: swap should not know about histeditrule's internals
rules[newpos].pos = newpos
rules[oldpos].pos = oldpos
start = min(oldpos, newpos)
end = max(oldpos, newpos)
for r in pycompat.xrange(start, end + 1):
rules[newpos].checkconflicts(rules[r])
rules[oldpos].checkconflicts(rules[r])
if self.selected:
self.make_selection(newpos)
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