equal
deleted
inserted
replaced
665 paths = repo.ui.paths |
665 paths = repo.ui.paths |
666 all_paths = urlutil.list_paths(repo.ui) |
666 all_paths = urlutil.list_paths(repo.ui) |
667 urls = util.sortdict((k, p.rawloc) for k, p in all_paths) |
667 urls = util.sortdict((k, p.rawloc) for k, p in all_paths) |
668 |
668 |
669 def makemap(k): |
669 def makemap(k): |
670 p = paths[k] |
670 ps = paths[k] |
671 d = {b'name': k, b'url': p.rawloc} |
671 d = {b'name': k} |
672 sub_opts = util.sortdict(sorted(pycompat.iteritems(p.suboptions))) |
672 if len(ps) == 1: |
673 d.update(sub_opts) |
673 d[b'url'] = ps[0].rawloc |
|
674 sub_opts = pycompat.iteritems(ps[0].suboptions) |
|
675 sub_opts = util.sortdict(sorted(sub_opts)) |
|
676 d.update(sub_opts) |
674 path_dict = util.sortdict() |
677 path_dict = util.sortdict() |
675 path_dict[b'url'] = p.rawloc |
678 for p in ps: |
676 path_dict.update(sub_opts) |
679 sub_opts = util.sortdict(sorted(pycompat.iteritems(p.suboptions))) |
677 d[b'urls'] = [path_dict] |
680 path_dict[b'url'] = p.rawloc |
|
681 path_dict.update(sub_opts) |
|
682 d[b'urls'] = [path_dict] |
678 return d |
683 return d |
679 |
684 |
680 def format_one(k): |
685 def format_one(k): |
681 return b'%s=%s' % (k, urls[k]) |
686 return b'%s=%s' % (k, urls[k]) |
682 |
687 |