Commit ceccf005 authored by Dan Villiom Podlaski Christiansen's avatar Dan Villiom Podlaski Christiansen
Browse files

merge 0.10.x branch into default

Pipeline #22978 passed with stages
in 21 minutes and 24 seconds
......@@ -1754,11 +1754,14 @@ class GitHandler(object):
return []
def remote_name(self, remote, push):
for path in self.ui.paths.values():
if push and path.pushloc == remote:
return path.name
if path.loc == remote:
return path.name
for name, paths in self.ui.paths.items():
# paths became lists in mercurial 5.9
if not isinstance(paths, list):
paths = [paths]
for path in paths:
if push and path.pushloc == remote or path.loc == remote:
return name
def audit_hg_path(self, path):
if b'.hg' in path.split(b'/') or b'\r' in path or b'\n' in path:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment