This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11639

chistedit: move renderrules() onto state class
ClosedPublic

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

Details

Reviewers
durin42
pulkit
Group Reviewers
hg-reviewers
Commits
rHG8dd2422b0109: chistedit: move renderrules() 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:56 PM
This revision is now accepted and ready to land.Oct 13 2021, 2:56 PM
martinvonz added a commit: rHG8dd2422b0109: chistedit: move renderrules() onto state class.Oct 13 2021, 6:26 PM
Closed by commit rHG8dd2422b0109: chistedit: move renderrules() 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 (70 lines)

Diff 30779

hgext/histedit.py

), ),
) )
return { return {
b'commit': (12, maxx), b'commit': (12, maxx),
b'help': (helplen, maxx), b'help': (helplen, maxx),
b'main': (mainlen, maxx), b'main': (mainlen, maxx),
} }
def render_rules(self, rulesscr):
def _chisteditmain(repo, rules, stdscr): rules = self.rules
try: pos = self.pos
curses.use_default_colors() selected = self.selected
except curses.error: start = self.modes[MODE_RULES][b'line_offset']
pass
# initialize color pattern
curses.init_pair(COLOR_HELP, curses.COLOR_WHITE, curses.COLOR_BLUE)
curses.init_pair(COLOR_SELECTED, curses.COLOR_BLACK, curses.COLOR_WHITE)
curses.init_pair(COLOR_WARN, curses.COLOR_BLACK, curses.COLOR_YELLOW)
curses.init_pair(COLOR_OK, curses.COLOR_BLACK, curses.COLOR_GREEN)
curses.init_pair(COLOR_CURRENT, curses.COLOR_WHITE, curses.COLOR_MAGENTA)
curses.init_pair(COLOR_DIFF_ADD_LINE, curses.COLOR_GREEN, -1)
curses.init_pair(COLOR_DIFF_DEL_LINE, curses.COLOR_RED, -1)
curses.init_pair(COLOR_DIFF_OFFSET, curses.COLOR_MAGENTA, -1)
curses.init_pair(COLOR_ROLL, curses.COLOR_RED, -1)
curses.init_pair(
COLOR_ROLL_CURRENT, curses.COLOR_BLACK, curses.COLOR_MAGENTA
)
curses.init_pair(COLOR_ROLL_SELECTED, curses.COLOR_RED, curses.COLOR_WHITE)
# don't display the cursor
try:
curses.curs_set(0)
except curses.error:
pass
def renderrules(rulesscr, state):
rules = state.rules
pos = state.pos
selected = state.selected
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:
line = b"potential conflict in %s" % b','.join( line = b"potential conflict in %s" % b','.join(
map(pycompat.bytestr, conflicts) map(pycompat.bytestr, conflicts)
) )
addln(rulesscr, -1, 0, line, curses.color_pair(COLOR_WARN)) addln(rulesscr, -1, 0, line, curses.color_pair(COLOR_WARN))
for y, rule in enumerate(rules[start:]): for y, rule in enumerate(rules[start:]):
if y >= state.page_height: if y >= self.page_height:
break break
if len(rule.conflicts) > 0: if len(rule.conflicts) > 0:
rulesscr.addstr(y, 0, b" ", curses.color_pair(COLOR_WARN)) rulesscr.addstr(y, 0, b" ", curses.color_pair(COLOR_WARN))
else: else:
rulesscr.addstr(y, 0, b" ", curses.COLOR_BLACK) rulesscr.addstr(y, 0, b" ", curses.COLOR_BLACK)
if y + start == selected: if y + start == selected:
rollcolor = COLOR_ROLL_SELECTED rollcolor = COLOR_ROLL_SELECTED
y, y,
2 + len(rule.prefix), 2 + len(rule.prefix),
rule.desc, rule.desc,
curses.color_pair(rollcolor), curses.color_pair(rollcolor),
) )
rulesscr.noutrefresh() rulesscr.noutrefresh()
def _chisteditmain(repo, rules, stdscr):
try:
curses.use_default_colors()
except curses.error:
pass
# initialize color pattern
curses.init_pair(COLOR_HELP, curses.COLOR_WHITE, curses.COLOR_BLUE)
curses.init_pair(COLOR_SELECTED, curses.COLOR_BLACK, curses.COLOR_WHITE)
curses.init_pair(COLOR_WARN, curses.COLOR_BLACK, curses.COLOR_YELLOW)
curses.init_pair(COLOR_OK, curses.COLOR_BLACK, curses.COLOR_GREEN)
curses.init_pair(COLOR_CURRENT, curses.COLOR_WHITE, curses.COLOR_MAGENTA)
curses.init_pair(COLOR_DIFF_ADD_LINE, curses.COLOR_GREEN, -1)
curses.init_pair(COLOR_DIFF_DEL_LINE, curses.COLOR_RED, -1)
curses.init_pair(COLOR_DIFF_OFFSET, curses.COLOR_MAGENTA, -1)
curses.init_pair(COLOR_ROLL, curses.COLOR_RED, -1)
curses.init_pair(
COLOR_ROLL_CURRENT, curses.COLOR_BLACK, curses.COLOR_MAGENTA
)
curses.init_pair(COLOR_ROLL_SELECTED, curses.COLOR_RED, curses.COLOR_WHITE)
# don't display the cursor
try:
curses.curs_set(0)
except curses.error:
pass
def renderstring(win, state, output, diffcolors=False): def renderstring(win, state, output, diffcolors=False):
maxy, maxx = win.getmaxyx() maxy, maxx = win.getmaxyx()
length = min(maxy - 1, len(output)) length = min(maxy - 1, len(output))
for y in range(0, length): for y in range(0, length):
line = output[y] line = output[y]
if diffcolors: if diffcolors:
if line and line[0] == b'+': if line and line[0] == b'+':
win.addstr( win.addstr(
commitwin.erase() commitwin.erase()
helpwin.erase() helpwin.erase()
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) state.render_rules(mainwin)
state.render_commit(commitwin) state.render_commit(commitwin)
state.render_help(helpwin) 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):