# HG changeset patch
# User Marcin Kasperski <Marcin.Kasperski@softax.pl>
# Date 2010-06-30 14:12:54
# Node ID abed620e04a67afb1055ad5d7112d9ddbc9da6ba
# Parent  3d7e47c1db007275c6f6b2144ffde23f4e13c13a

Stopped raising error when username is specified both in ~/.hgrc and
<repo>/.hg/hgrc if it is the same in both places.

diff --git a/mercurial_keyring.py b/mercurial_keyring.py
--- a/mercurial_keyring.py
+++ b/mercurial_keyring.py
@@ -132,7 +132,7 @@ class HTTPPasswordHandler(object):
                 return user, pwd
 
         if auth_user:
-            if user:
+            if user and (user != auth_user):
                 raise util.Abort(_('mercurial_keyring: username for %s specified both in repository path (%s) and in .hg/hgrc/[auth] (%s). Please, leave only one of those' % (base_url, user, auth_user)))
             user = auth_user
             if pwd: