--- a/mercurial/ui.py	Sun Jul 10 15:59:26 2005 -0800
+++ b/mercurial/ui.py	Sun Jul 10 16:00:17 2005 -0800
@@ -97,9 +97,12 @@
                   os.environ.get("HGEDITOR") or
                   os.environ.get("EDITOR", "vi"))
 
+        os.environ["HGUSER"] = self.username()
         util.system("%s %s" % (editor, name), errprefix = "edit failed")
 
         t = open(name).read()
         t = re.sub("(?m)^HG:.*\n", "", t)
 
+        os.unlink(name)
+
         return t