comparison easyhg.py @ 453:f2ab2cdd000b authfile_refactor

Associate username with pathless URL, as well as password

 #
 #    EasyMercurial
 #
 #    Based on hgExplorer by Jari Korhonen
 #    Copyright (c) 2010 Jari Korhonen
-#    Copyright (c) 2010 Chris Cannam
-#    Copyright (c) 2010 Queen Mary, University of London
+#    Copyright (c) 2010-2011 Chris Cannam
+#    Copyright (c) 2010-2011 Queen Mary, University of London
 #    
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU General Public License as
 #    published by the Free Software Foundation; either version 2 of the
 #    License, or (at your option) any later version.  See the file

     def pathless_url(self):
         parsed = urlparse.urlparse(self.remote_url)
         return "%s://%s" % (parsed.scheme, parsed.netloc)
 
     def load_config(self):
-        self.auth_config = ConfigParser.RawConfigParser()
+        if not self.auth_config:
+            self.auth_config = ConfigParser.RawConfigParser()
         fp = None
         try:
             fp = open(self.auth_file)
         except:
             self.ui.write("unable to read authfile %s, ignoring\n" % self.auth_file)

         h.update(s)
         hx = h.hexdigest()
         return hx
     
     def remote_user_key(self):
-        return self.remote_key(self.argless_url(), '')
+        return self.remote_key(self.pathless_url(), '')
     
     def remote_passwd_key(self):
         return self.remote_key(self.pathless_url(), self.user)
 
     def load_auth_data(self):

             if d:
                 self.passwd = self.decrypt(d)
 
     def save_auth_data(self):
 
+        self.load_config()
         if not self.auth_config: return
-
+    
         self.set_to_config('preferences', 'remember', self.remember)
 
         self.ui.write('aiming to store details for user %s\n' % self.user)
     
         if self.remember and self.user: