changeset 1882 | c0320567931f |
parent 1876 | 2e0fd78587bd |
child 1892 | 622ee75cb4c9 |
--- a/mercurial/ui.py +++ b/mercurial/ui.py @@ -209,7 +209,9 @@ class ui(object): 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)