Commit c7690fab authored by Martin von Zweigbergk's avatar Martin von Zweigbergk
Browse files

chistedit: move patchcontents() onto state class

Differential Revision: https://phab.mercurial-scm.org/D11642
parent 3fdeb657602f
...@@ -1218,7 +1218,7 @@ ...@@ -1218,7 +1218,7 @@
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'] = patchcontents(state) state.modes[MODE_PATCH][b'patchcontents'] = state.patch_contents()
def makeselection(state, pos): def makeselection(state, pos):
...@@ -1325,19 +1325,6 @@ ...@@ -1325,19 +1325,6 @@
return line[: n - 2] + b' >' return line[: n - 2] + b' >'
def patchcontents(state):
repo = state.repo
rule = state.rules[state.pos]
displayer = logcmdutil.changesetdisplayer(
repo.ui, repo, {b"patch": True, b"template": b"status"}, buffered=True
)
overrides = {(b'ui', b'verbose'): True}
with repo.ui.configoverride(overrides, source=b'histedit'):
displayer.show(rule.ctx)
displayer.close()
return displayer.hunk[rule.ctx.rev()].splitlines()
class _chistedit_state(object): class _chistedit_state(object):
def __init__( def __init__(
self, self,
...@@ -1590,6 +1577,21 @@ ...@@ -1590,6 +1577,21 @@
elif action == b'line-up': elif action == b'line-up':
return E_LINEUP return E_LINEUP
def patch_contents(self):
repo = self.repo
rule = self.rules[self.pos]
displayer = logcmdutil.changesetdisplayer(
repo.ui,
repo,
{b"patch": True, b"template": b"status"},
buffered=True,
)
overrides = {(b'ui', b'verbose'): True}
with repo.ui.configoverride(overrides, source=b'histedit'):
displayer.show(rule.ctx)
displayer.close()
return displayer.hunk[rule.ctx.rev()].splitlines()
def _chisteditmain(repo, rules, stdscr): def _chisteditmain(repo, rules, stdscr):
try: try:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment