diff -r e12553cfd0a4 -r 7080652af6e6 mercurial/cmdutil.py
--- a/mercurial/cmdutil.py	Thu Jan 19 23:01:32 2017 +0900
+++ b/mercurial/cmdutil.py	Wed Jan 18 18:25:51 2017 -0800
@@ -232,7 +232,7 @@
                              + fp.read())
                 reviewedpatch = ui.edit(patchtext, "",
                                         extra={"suffix": ".diff"},
-                                        tmpdir=repo.path)
+                                        repopath=repo.path)
                 fp.truncate(0)
                 fp.write(reviewedpatch)
                 fp.seek(0)
@@ -2782,7 +2782,7 @@
 
     editortext = repo.ui.edit(committext, ctx.user(), ctx.extra(),
                               editform=editform, pending=pending,
-                              tmpdir=repo.path)
+                              repopath=repo.path)
     text = editortext
 
     # strip away anything below this special string (used for editors that want