##// END OF EJS Templates
obfuscation: don't always set passwd to obfuscated text. In case there's...
marcink -
r121:7eb14a12 stable
parent child Browse files
Show More
@@ -169,7 +169,7 b' class GitRemote(object):'
169 def check_url(self, url, config):
169 def check_url(self, url, config):
170 url_obj = url_parser(url)
170 url_obj = url_parser(url)
171 test_uri, _ = url_obj.authinfo()
171 test_uri, _ = url_obj.authinfo()
172 url_obj.passwd = '*****'
172 url_obj.passwd = '*****' if url_obj.passwd else url_obj.passwd
173 url_obj.query = obfuscate_qs(url_obj.query)
173 url_obj.query = obfuscate_qs(url_obj.query)
174 cleaned_uri = str(url_obj)
174 cleaned_uri = str(url_obj)
175 log.info("Checking URL for remote cloning/import: %s", cleaned_uri)
175 log.info("Checking URL for remote cloning/import: %s", cleaned_uri)
@@ -328,7 +328,7 b' class HgRemote(object):'
328 handlers = []
328 handlers = []
329 url_obj = url_parser(url)
329 url_obj = url_parser(url)
330 test_uri, authinfo = url_obj.authinfo()
330 test_uri, authinfo = url_obj.authinfo()
331 url_obj.passwd = '*****'
331 url_obj.passwd = '*****' if url_obj.passwd else url_obj.passwd
332 url_obj.query = obfuscate_qs(url_obj.query)
332 url_obj.query = obfuscate_qs(url_obj.query)
333
333
334 cleaned_uri = str(url_obj)
334 cleaned_uri = str(url_obj)
@@ -444,8 +444,9 b' class HgRemote(object):'
444 result = []
444 result = []
445 for i, annotate_data in enumerate(fctx.annotate()):
445 for i, annotate_data in enumerate(fctx.annotate()):
446 ln_no = i + 1
446 ln_no = i + 1
447 sha = hex(annotate_data[0].node())
447 node_info, content = annotate_data
448 result.append((ln_no, sha, annotate_data[1]))
448 sha = hex(node_info[0].node())
449 result.append((ln_no, sha, content))
449 return result
450 return result
450
451
451 @reraise_safe_exceptions
452 @reraise_safe_exceptions
General Comments 0
You need to be logged in to leave comments. Login now