Mercurial > public > mercurial-scm > hg-stable
diff mercurial/ui.py @ 608:d2994b5298fb
Add username/merge/editor to .hgrc
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Add username/merge/editor to .hgrc
These take priority over the equivalent environment vars
Deprecate HGMERGE, HGUSER, and HGEDITOR in docs
Add ui section to docs
Remove undocumented HG_OPTS
Raise username code out of changelog class
Make tests ignore ~/.hgrc
manifest hash: d127ef02bc5266036b4c77a55319519e91bd475b
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCyM5NywK+sNU5EO8RAuU7AJ9zKk1TFrJXHM04jOOJJeBSp8jlTgCeP+tr
qwGFd+WaNqTepZ0wun5g9Uc=
=QEBu
-----END PGP SIGNATURE-----
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sun, 03 Jul 2005 21:51:09 -0800 |
| parents | 9a80418646dd |
| children | 5374955ec5b1 |
line wrap: on
line diff
--- a/mercurial/ui.py Sun Jul 03 21:14:40 2005 -0800 +++ b/mercurial/ui.py Sun Jul 03 21:51:09 2005 -0800 @@ -41,6 +41,14 @@ return self.cdata.items(section) return [] + def username(self): + return (self.config("ui", "username") or + os.environ.get("HGUSER") or + os.environ.get("EMAIL") or + (os.environ.get("LOGNAME", + os.environ.get("USERNAME", "unknown")) + + '@' + socket.getfqdn())) + def expandpath(self, loc): paths = {} for name, path in self.configitems("paths"): @@ -83,7 +91,10 @@ f.write(text) f.close() - editor = os.environ.get("HGEDITOR") or os.environ.get("EDITOR", "vi") + editor = (self.config("ui", "editor") or + os.environ.get("HGEDITOR") or + os.environ.get("EDITOR", "vi")) + util.system("%s %s" % (editor, name), errprefix = "edit failed") t = open(name).read()