comparison mercurial/tagmerge.py @ 36733:66250de006c6

py3: do not mutate dict while iterating in tagmerge

36732:723e87c8c059

    generate an .hgtags file which is correct (in the sense that its contents
    correspond to the result of the tag merge) while also being as close as
    possible to the first parent's .hgtags file.
    '''
    # group the node-tag pairs that must be written next to each other
    for tname, taglist in mergedtags.items():
        mergedtags[tname] = grouptagnodesbyline(taglist)

    # convert the grouped merged tags dict into a format that resembles the
    # final .hgtags file (i.e. a list of blocks of 'node tag' pairs)
    def taglist2string(tlist, tname):

        return True, 1

    writemergedtags(fcd, mergedtags)
    ui.note(_('.hgtags merged successfully\n'))
    return False, 0

36733:66250de006c6

    generate an .hgtags file which is correct (in the sense that its contents
    correspond to the result of the tag merge) while also being as close as
    possible to the first parent's .hgtags file.
    '''
    # group the node-tag pairs that must be written next to each other
    for tname, taglist in list(mergedtags.items()):
        mergedtags[tname] = grouptagnodesbyline(taglist)

    # convert the grouped merged tags dict into a format that resembles the
    # final .hgtags file (i.e. a list of blocks of 'node tag' pairs)
    def taglist2string(tlist, tname):

        return True, 1

    writemergedtags(fcd, mergedtags)
    ui.note(_('.hgtags merged successfully\n'))
    return False, 0