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

compat: handle paths being lists in mercurial's default branch

--HG--
branch : 0.10.x
parent c7ba1af964a3
Pipeline #22974 passed with stages
in 20 minutes and 11 seconds
......@@ -1756,11 +1756,14 @@ class GitHandler(object):
return []
def remote_name(self, remote, push):
for path in compat.itervalues(self.ui.paths):
if push and path.pushloc == remote:
return path.name
if path.loc == remote:
return path.name
for name, paths in compat.iteritems(self.ui.paths):
# 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'/'):
......
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