Show More
@@ -1218,7 +1218,7 def changemode(state, mode): | |||||
1218 | curmode, _ = state.mode |
|
1218 | curmode, _ = state.mode | |
1219 | state.mode = (mode, curmode) |
|
1219 | state.mode = (mode, curmode) | |
1220 | if mode == MODE_PATCH: |
|
1220 | if mode == MODE_PATCH: | |
1221 |
state.modes[MODE_PATCH][b'patchcontents'] = patchcontents( |
|
1221 | state.modes[MODE_PATCH][b'patchcontents'] = state.patch_contents() | |
1222 |
|
1222 | |||
1223 |
|
1223 | |||
1224 | def makeselection(state, pos): |
|
1224 | def makeselection(state, pos): | |
@@ -1325,19 +1325,6 def _trunc_tail(line, n): | |||||
1325 | return line[: n - 2] + b' >' |
|
1325 | return line[: n - 2] + b' >' | |
1326 |
|
1326 | |||
1327 |
|
1327 | |||
1328 | def patchcontents(state): |
|
|||
1329 | repo = state.repo |
|
|||
1330 | rule = state.rules[state.pos] |
|
|||
1331 | displayer = logcmdutil.changesetdisplayer( |
|
|||
1332 | repo.ui, repo, {b"patch": True, b"template": b"status"}, buffered=True |
|
|||
1333 | ) |
|
|||
1334 | overrides = {(b'ui', b'verbose'): True} |
|
|||
1335 | with repo.ui.configoverride(overrides, source=b'histedit'): |
|
|||
1336 | displayer.show(rule.ctx) |
|
|||
1337 | displayer.close() |
|
|||
1338 | return displayer.hunk[rule.ctx.rev()].splitlines() |
|
|||
1339 |
|
||||
1340 |
|
||||
1341 | class _chistedit_state(object): |
|
1328 | class _chistedit_state(object): | |
1342 | def __init__( |
|
1329 | def __init__( | |
1343 | self, |
|
1330 | self, | |
@@ -1590,6 +1577,21 pgup/K: move patch up, pgdn/J: move patc | |||||
1590 | elif action == b'line-up': |
|
1577 | elif action == b'line-up': | |
1591 | return E_LINEUP |
|
1578 | return E_LINEUP | |
1592 |
|
1579 | |||
|
1580 | def patch_contents(self): | |||
|
1581 | repo = self.repo | |||
|
1582 | rule = self.rules[self.pos] | |||
|
1583 | displayer = logcmdutil.changesetdisplayer( | |||
|
1584 | repo.ui, | |||
|
1585 | repo, | |||
|
1586 | {b"patch": True, b"template": b"status"}, | |||
|
1587 | buffered=True, | |||
|
1588 | ) | |||
|
1589 | overrides = {(b'ui', b'verbose'): True} | |||
|
1590 | with repo.ui.configoverride(overrides, source=b'histedit'): | |||
|
1591 | displayer.show(rule.ctx) | |||
|
1592 | displayer.close() | |||
|
1593 | return displayer.hunk[rule.ctx.rev()].splitlines() | |||
|
1594 | ||||
1593 |
|
1595 | |||
1594 | def _chisteditmain(repo, rules, stdscr): |
|
1596 | def _chisteditmain(repo, rules, stdscr): | |
1595 | try: |
|
1597 | try: |
General Comments 0
You need to be logged in to leave comments.
Login now