Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/ui.py @ 1679:675ca845c2f8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with upstream
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Thu, 15 Dec 2005 18:04:39 +0100
parents dd186cb70a64
children c50bddfbc812
comparison
equal deleted inserted replaced
1678:b345cc4c22c0 1679:675ca845c2f8
143 editor = (os.environ.get("HGEDITOR") or 143 editor = (os.environ.get("HGEDITOR") or
144 self.config("ui", "editor") or 144 self.config("ui", "editor") or
145 os.environ.get("EDITOR", "vi")) 145 os.environ.get("EDITOR", "vi"))
146 146
147 os.environ["HGUSER"] = self.username() 147 os.environ["HGUSER"] = self.username()
148 util.system("%s %s" % (editor, name), errprefix=_("edit failed")) 148 util.system("%s \"%s\"" % (editor, name), errprefix=_("edit failed"))
149 149
150 t = open(name).read() 150 t = open(name).read()
151 t = re.sub("(?m)^HG:.*\n", "", t) 151 t = re.sub("(?m)^HG:.*\n", "", t)
152 152
153 os.unlink(name) 153 os.unlink(name)