equal
deleted
inserted
replaced
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 p = paths[k] |
671 d = {b'name': k, b'url': p.rawloc} |
671 d = {b'name': k, b'url': p.rawloc} |
672 d.update((o, v) for o, v in sorted(pycompat.iteritems(p.suboptions))) |
672 sub_opts = util.sortdict(sorted(pycompat.iteritems(p.suboptions))) |
|
673 d.update(sub_opts) |
|
674 path_dict = util.sortdict() |
|
675 path_dict[b'url'] = p.rawloc |
|
676 path_dict.update(sub_opts) |
|
677 d[b'urls'] = [path_dict] |
673 return d |
678 return d |
674 |
679 |
675 def format_one(k): |
680 def format_one(k): |
676 return b'%s=%s' % (k, urls[k]) |
681 return b'%s=%s' % (k, urls[k]) |
677 |
682 |