diff -r e12553cfd0a4 -r 7080652af6e6 mercurial/ui.py
--- a/mercurial/ui.py	Thu Jan 19 23:01:32 2017 +0900
+++ b/mercurial/ui.py	Wed Jan 18 18:25:51 2017 -0800
@@ -1022,7 +1022,7 @@
             self.write(*msg, **opts)
 
     def edit(self, text, user, extra=None, editform=None, pending=None,
-             tmpdir=None):
+             repopath=None):
         extra_defaults = {
             'prefix': 'editor',
             'suffix': '.txt',
@@ -1031,12 +1031,12 @@
             extra_defaults.update(extra)
         extra = extra_defaults
 
-        tdir = None
+        rdir = None
         if self.configbool('experimental', 'editortmpinhg'):
-            tdir = tmpdir
+            rdir = repopath
         (fd, name) = tempfile.mkstemp(prefix='hg-' + extra['prefix'] + '-',
                                       suffix=extra['suffix'], text=True,
-                                      dir=tdir)
+                                      dir=rdir)
         try:
             f = os.fdopen(fd, "w")
             f.write(text)