Mercurial > public > mercurial-scm > hg-stable
diff mercurial/hgweb/hgweb_mod.py @ 5779:e9f68860d5ed
Don't let ui.username override web.contact (issue900)
4603eef60237 introduced using ui.username before web.contact, but this was
never documented and might cause commit accidents.
- Drop web.author (deprecated since 2005)
- Try ui.username or $EMAIL as a fallback to display something useful.
- Update docs for the fallbacks.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Tue, 01 Jan 2008 17:07:15 +0100 |
| parents | 652f57de3ccf |
| children | 323b9c55b328 |
line wrap: on
line diff
--- a/mercurial/hgweb/hgweb_mod.py Tue Jan 01 11:19:15 2008 +0100 +++ b/mercurial/hgweb/hgweb_mod.py Tue Jan 01 17:07:15 2008 +0100 @@ -10,7 +10,7 @@ from mercurial.node import * from mercurial import mdiff, ui, hg, util, archival, patch from mercurial import revlog, templater -from common import ErrorResponse, get_mtime, style_map, paritygen +from common import ErrorResponse, get_mtime, style_map, paritygen, get_contact from request import wsgirequest import webcommands, protocol @@ -808,9 +808,7 @@ yield tmpl("summary", desc=self.config("web", "description", "unknown"), - owner=(self.config("ui", "username") or # preferred - self.config("web", "contact") or # deprecated - self.config("web", "author", "unknown")), # also + owner=get_contact(self.config) or "unknown", lastchange=cl.read(cl.tip())[2], tags=tagentries, branches=branches,