equal
deleted
inserted
replaced
683 def makemap(k): |
683 def makemap(k): |
684 ps = paths[k] |
684 ps = paths[k] |
685 d = {b'name': k} |
685 d = {b'name': k} |
686 if len(ps) == 1: |
686 if len(ps) == 1: |
687 d[b'url'] = ps[0].rawloc |
687 d[b'url'] = ps[0].rawloc |
688 sub_opts = pycompat.iteritems(ps[0].suboptions) |
688 sub_opts = ps[0].suboptions.items() |
689 sub_opts = util.sortdict(sorted(sub_opts)) |
689 sub_opts = util.sortdict(sorted(sub_opts)) |
690 d.update(sub_opts) |
690 d.update(sub_opts) |
691 path_dict = util.sortdict() |
691 path_dict = util.sortdict() |
692 for p in ps: |
692 for p in ps: |
693 sub_opts = util.sortdict(sorted(p.suboptions.items())) |
693 sub_opts = util.sortdict(sorted(p.suboptions.items())) |