Mercurial > public > mercurial-scm > hg-stable
diff mercurial/ui.py @ 691:61c6b4178b9e
HG environment variables take precedence over hgrc
manifest hash: c128b53429f861c0b75c2a81c6ad4907e4779810
| author | mpm@selenic.com |
|---|---|
| date | Wed, 13 Jul 2005 01:48:03 -0800 |
| parents | b55a78595ef6 |
| children | 859de3ebc041 52d8d81e72ad 4f81068ed8cd |
line wrap: on
line diff
--- a/mercurial/ui.py Wed Jul 13 01:46:50 2005 -0800 +++ b/mercurial/ui.py Wed Jul 13 01:48:03 2005 -0800 @@ -44,8 +44,8 @@ return [] def username(self): - return (self.config("ui", "username") or - os.environ.get("HGUSER") or + return (os.environ.get("HGUSER") or + self.config("ui", "username") or os.environ.get("EMAIL") or (os.environ.get("LOGNAME", os.environ.get("USERNAME", "unknown")) @@ -93,8 +93,8 @@ f.write(text) f.close() - editor = (self.config("ui", "editor") or - os.environ.get("HGEDITOR") or + editor = (os.environ.get("HGEDITOR") or + self.config("ui", "editor") or os.environ.get("EDITOR", "vi")) os.environ["HGUSER"] = self.username()