diff mercurial/fancyopts.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 9a8daeff0ffa
children 31a9aa890016
line wrap: on
line diff
--- a/mercurial/fancyopts.py	Sun Jul 03 21:14:40 2005 -0800
+++ b/mercurial/fancyopts.py	Sun Jul 03 21:51:09 2005 -0800
@@ -14,9 +14,6 @@
         if s: short = short + s
         if l: long.append(l)
 
-    if os.environ.has_key("HG_OPTS"):
-        args = os.environ["HG_OPTS"].split() + args
-
     opts, args = getopt.getopt(args, short, long)
 
     for opt, arg in opts: