# HG changeset patch
# User mpm@selenic.com
# Date 1119953903 28800
# Node ID a350c1cd3fc54e9602fbff38a66f72ba62998752
# Parent  c6a2e41c8c607da17917e9c15c4799e0c31e027b
Use $USERNAME as a fallback for commit

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Use $USERNAME as a fallback for commit

Suggested by Giuseppe Bilotta <bilotta78@hotpop.com>

manifest hash: 3f86a63aebaf6c30eaa3a2081e1e5f9caa20caa1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCwSPvywK+sNU5EO8RAqpYAKCmwfTfeNGCTqy2wuBs/bmtxMKt1ACeIpRo
/vencPT6Z/WNXW+6p9NlZRY=
=jFZ/
-----END PGP SIGNATURE-----


diff --git a/mercurial/hg.py b/mercurial/hg.py
--- a/mercurial/hg.py
+++ b/mercurial/hg.py
@@ -164,7 +164,9 @@ class changelog(revlog):
         user = (user or
                 os.environ.get("HGUSER") or
                 os.environ.get("EMAIL") or
-                os.environ.get("LOGNAME", "unknown") + '@' + socket.getfqdn())
+                (os.environ.get("LOGNAME",
+                               os.environ.get("USERNAME", "unknown"))
+                 + '@' + socket.getfqdn()))
         date = date or "%d %d" % (time.time(), time.timezone)
         list.sort()
         l = [hex(manifest), user, date] + list + ["", desc]