[Updated] D11642: chistedit: move patchcontents() onto state class

martinvonz (Martin von Zweigbergk) phabricator at mercurial-scm.org
Wed Oct 13 22:27:41 UTC 2021


Closed by commit rHGc7690fabce5f: chistedit: move patchcontents() onto state class (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D11642?vs=30730&id=30782

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D11642/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D11642

AFFECTED FILES
  hgext/histedit.py

CHANGE DETAILS

diff --git a/hgext/histedit.py b/hgext/histedit.py
--- a/hgext/histedit.py
+++ b/hgext/histedit.py
@@ -1218,7 +1218,7 @@
     curmode, _ = state.mode
     state.mode = (mode, curmode)
     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):
@@ -1325,19 +1325,6 @@
     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):
     def __init__(
         self,
@@ -1590,6 +1577,21 @@
         elif action == b'line-up':
             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):
     try:



To: martinvonz, durin42, #hg-reviewers, pulkit
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20211013/891edbf6/attachment-0002.html>


More information about the Mercurial-patches mailing list