diff -r 05c7d75be925 -r c0320567931f mercurial/ui.py
--- a/mercurial/ui.py	Fri Mar 10 22:24:19 2006 -0800
+++ b/mercurial/ui.py	Fri Mar 10 22:42:59 2006 -0800
@@ -209,7 +209,9 @@
                   os.environ.get("EDITOR", "vi"))
 
         os.environ["HGUSER"] = self.username()
-        util.system("%s \"%s\"" % (editor, name), errprefix=_("edit failed"))
+        util.system("%s \"%s\"" % (editor, name),
+                    environ={'HGUSER': self.username()},
+                    onerr=util.Abort, errprefix=_("edit failed"))
 
         t = open(name).read()
         t = re.sub("(?m)^HG:.*\n", "", t)