This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11637

chistedit: move rendercommit() onto state class
ClosedPublic

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

Details

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

Diff 30777

hgext/histedit.py

MODE_RULES: { MODE_RULES: {
b'line_offset': 0, b'line_offset': 0,
}, },
MODE_PATCH: { MODE_PATCH: {
b'line_offset': 0, b'line_offset': 0,
}, },
} }
def render_commit(self, win):
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 rendercommit(win, state):
"""Renders the commit window that shows the log of the current selected """Renders the commit window that shows the log of the current selected
commit""" commit"""
pos = state.pos pos = self.pos
rules = state.rules rules = self.rules
rule = rules[pos] rule = rules[pos]
ctx = rule.ctx ctx = rule.ctx
win.box() win.box()
maxy, maxx = win.getmaxyx() maxy, maxx = win.getmaxyx()
length = maxx - 3 length = maxx - 3
line = b"changeset: %d:%s" % (ctx.rev(), ctx.hex()[:12]) line = b"changeset: %d:%s" % (ctx.rev(), ctx.hex()[:12])
win.addstr(1, 1, line[:length]) win.addstr(1, 1, line[:length])
line = b"user: %s" % ctx.user() line = b"user: %s" % ctx.user()
win.addstr(2, 1, line[:length]) win.addstr(2, 1, line[:length])
bms = repo.nodebookmarks(ctx.node()) bms = self.repo.nodebookmarks(ctx.node())
line = b"bookmark: %s" % b' '.join(bms) line = b"bookmark: %s" % b' '.join(bms)
win.addstr(3, 1, line[:length]) win.addstr(3, 1, line[:length])
line = b"summary: %s" % (ctx.description().splitlines()[0]) line = b"summary: %s" % (ctx.description().splitlines()[0])
win.addstr(4, 1, line[:length]) win.addstr(4, 1, line[:length])
line = b"files: " line = b"files: "
win.addstr(5, 1, line) win.addstr(5, 1, line)
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 _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 helplines(mode): def helplines(mode):
if mode == MODE_PATCH: if mode == MODE_PATCH:
help = b"""\ help = b"""\
?: help, k/up: line up, j/down: line down, v: stop viewing patch ?: help, k/up: line up, j/down: line down, v: stop viewing patch
pgup: prev page, space/pgdn: next page, c: commit, q: abort pgup: prev page, space/pgdn: next page, c: commit, q: abort
""" """
else: else:
help = b"""\ help = b"""\
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) renderrules(mainwin, state)
rendercommit(commitwin, state) state.render_commit(commitwin)
renderhelp(helpwin, state) renderhelp(helpwin, state)
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