diff -r f77f3383c666 -r 6f61c480f51c mercurial/url.py --- a/mercurial/url.py Fri Feb 19 02:23:38 2010 +0100 +++ b/mercurial/url.py Fri Feb 19 02:51:35 2010 +0100 @@ -510,10 +510,11 @@ keyfile = None certfile = None - if args: # key_file - keyfile = args.pop(0) - if args: # cert_file - certfile = args.pop(0) + if len(args) >= 1: # key_file + keyfile = args[0] + if len(args) >= 2: # cert_file + certfile = args[1] + args = args[2:] # if the user has specified different key/cert files in # hgrc, we prefer these