record: extract a closure to the module level

This clean up is almost as gratuituous as this closure was.

mercurial/cmdutil.py

@@ -8,6 +8,7 b''
 
 import copy as copymod
 import errno
+import functools
 import os
 import re
 
@@ -440,22 +441,17 b' def recordfilter(ui, originalhunks, matc'
     return newchunks, newopts
 
 
-def dorecord(
-    ui, repo, commitfunc, cmdsuggest, backupall, filterfn, *pats, **opts
+def _record(
+    ui,
+    repo,
+    message,
+    match,
+    opts,
+    commitfunc,
+    backupall,
+    filterfn,
+    pats,
 ):
-    opts = pycompat.byteskwargs(opts)
-    if not ui.interactive():
-        if cmdsuggest:
-            msg = _(b'running non-interactively, use %s instead') % cmdsuggest
-        else:
-            msg = _(b'running non-interactively')
-        raise error.InputError(msg)
-
-    # make sure username is set before going interactive
-    if not opts.get(b'user'):
-        ui.username()  # raise exception, username not provided
-
-    def recordfunc(ui, repo, message, match, opts):
         """This is generic record driver.
 
         Its job is to interactively filter local changes, and
@@ -476,10 +472,7 b' def dorecord('
         merge = len(wctx.parents()) > 1
         if merge:
             raise error.InputError(
-                _(
-                    b'cannot partially commit a merge '
-                    b'(use "hg commit" instead)'
-                )
+            _(b'cannot partially commit a merge ' b'(use "hg commit" instead)')
             )
 
         def fail(f, msg):
@@ -597,9 +590,7 b' def dorecord('
             # 2.5 optionally review / modify patch in text editor
             if opts.get(b'review', False):
                 patchtext = (
-                    crecordmod.diffhelptext
-                    + crecordmod.patchhelptext
-                    + fp.read()
+                crecordmod.diffhelptext + crecordmod.patchhelptext + fp.read()
                 )
                 reviewedpatch = ui.edit(
                     patchtext, b"", action=b"diff", repopath=repo.path
@@ -670,7 +661,31 b' def dorecord('
             except OSError:
                 pass
 
-    return commit(ui, repo, recordfunc, pats, opts)
+
+def dorecord(
+    ui, repo, commitfunc, cmdsuggest, backupall, filterfn, *pats, **opts
+):
+    opts = pycompat.byteskwargs(opts)
+    if not ui.interactive():
+        if cmdsuggest:
+            msg = _(b'running non-interactively, use %s instead') % cmdsuggest
+        else:
+            msg = _(b'running non-interactively')
+        raise error.InputError(msg)
+
+    # make sure username is set before going interactive
+    if not opts.get(b'user'):
+        ui.username()  # raise exception, username not provided
+
+    func = functools.partial(
+        _record,
+        commitfunc=commitfunc,
+        backupall=backupall,
+        filterfn=filterfn,
+        pats=pats,
+    )
+
+    return commit(ui, repo, func, pats, opts)
 
 
 class dirnode: