comparison mercurial/url.py @ 10809:da3b4b7a45ce stable

Merge with i18n
author Matt Mackall <mpm@selenic.com>
date Thu, 01 Apr 2010 17:40:47 -0500
parents 1148a968a070
children e4f911ce21de
comparison
equal deleted inserted replaced
10808:1ebba857b371 10809:da3b4b7a45ce
143 if '.' not in key: 143 if '.' not in key:
144 self.ui.warn(_("ignoring invalid [auth] key '%s'\n") % key) 144 self.ui.warn(_("ignoring invalid [auth] key '%s'\n") % key)
145 continue 145 continue
146 group, setting = key.split('.', 1) 146 group, setting = key.split('.', 1)
147 gdict = config.setdefault(group, dict()) 147 gdict = config.setdefault(group, dict())
148 if setting in ('cert', 'key'):
149 val = util.expandpath(val)
148 gdict[setting] = val 150 gdict[setting] = val
149 151
150 # Find the best match 152 # Find the best match
151 scheme, hostpath = uri.split('://', 1) 153 scheme, hostpath = uri.split('://', 1)
152 bestlen = 0 154 bestlen = 0