Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/ui.py @ 1985:c577689006fa
Adapted behaviour of ui.username() to documentation and mention it explicitly:
Searched in this order: $HGUSER, [ui] section of hgrcs, $EMAIL
and stop searching if one of these is set.
Abort if found username is an empty string to force specifying
the commit user elsewhere, e.g. with line option or repo hgrc.
If not found, use $LOGNAME or $USERNAME +"@full.hostname".
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Tue, 21 Mar 2006 15:33:29 +0100 |
parents | df7436f439a0 |
children | 0541768fa558 |
line wrap: on
line diff
--- a/mercurial/ui.py +++ b/mercurial/ui.py @@ -141,12 +141,26 @@ class ui(object): return ret def username(self): - 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")) - + '@' + socket.getfqdn())) + """Return default username to be used in commits. + + Searched in this order: $HGUSER, [ui] section of hgrcs, $EMAIL + and stop searching if one of these is set. + Abort if found username is an empty string to force specifying + the commit user elsewhere, e.g. with line option or repo hgrc. + If not found, use $LOGNAME or $USERNAME +"@full.hostname". + """ + user = os.environ.get("HGUSER") + if user is None: + user = self.config("ui", "username") + if user is None: + user = os.environ.get("EMAIL") + if user is None: + user = os.environ.get("LOGNAME") or os.environ.get("USERNAME") + if user: + user = "%s@%s" % (user, socket.getfqdn()) + if not user: + raise util.Abort(_("Please specify a username.")) + return user def shortuser(self, user): """Return a short representation of a user name or email address."""