Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with crew
authorBenoit Boissinot <benoit.boissinot@ens-lyon.org>
Tue, 20 Oct 2009 00:30:36 +0200
changeset 9616 0fedf8233b21
parent 9615 f51d1822d6fd (current diff)
parent 9613 c63c336ee2f7 (diff)
child 9617 fafd653134d0
merge with crew
--- a/mercurial/ui.py	Sun Oct 18 14:35:36 2009 +0200
+++ b/mercurial/ui.py	Tue Oct 20 00:30:36 2009 +0200
@@ -179,7 +179,7 @@
             user = os.environ.get("EMAIL")
         if user is None and self.configbool("ui", "askusername"):
             user = self.prompt(_("enter a commit username:"), default=None)
-        if user is None:
+        if user is None and not self.interactive():
             try:
                 user = '%s@%s' % (util.getuser(), socket.getfqdn())
                 self.warn(_("No username found, using '%s' instead\n") % user)
Mercurial