diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -231,7 +231,8 @@ def dorecord(ui, repo, commitfunc, cmdsu
                              + crecordmod.patchhelptext
                              + fp.read())
                 reviewedpatch = ui.edit(patchtext, "",
-                                        extra={"suffix": ".diff"})
+                                        extra={"suffix": ".diff"},
+                                        tmpdir=repo.path)
                 fp.truncate(0)
                 fp.write(reviewedpatch)
                 fp.seek(0)
@@ -2780,7 +2781,8 @@ def commitforceeditor(repo, ctx, subs, f
     pending = tr and tr.writepending() and repo.root
 
     editortext = repo.ui.edit(committext, ctx.user(), ctx.extra(),
-                        editform=editform, pending=pending)
+                              editform=editform, pending=pending,
+                              tmpdir=repo.path)
     text = editortext
 
     # strip away anything below this special string (used for editors that want