diff -r 8a2dfac89ad6 -r cc76c619bed6 mercurial/ui.py
--- a/mercurial/ui.py	Fri Feb 14 00:36:44 2014 +0100
+++ b/mercurial/ui.py	Thu Feb 06 11:38:28 2014 +0400
@@ -714,7 +714,7 @@
         if self.debugflag:
             opts['label'] = opts.get('label', '') + ' ui.debug'
             self.write(*msg, **opts)
-    def edit(self, text, user):
+    def edit(self, text, user, extra={}):
         (fd, name) = tempfile.mkstemp(prefix="hg-editor-", suffix=".txt",
                                       text=True)
         try: