mercurial/patch.py

23994:8a2156780839

    copyto = dict([(v, k) for k, v in copy.items()])

    if opts.git:
        revs = None

    modifiedset, addedset, removedset = set(modified), set(added), set(removed)
    # Fix up modified and added, since merged-in additions appear as
    # modifications during merges
    for f in modifiedset.copy():
        if f not in ctx1:
            addedset.add(f)
            modifiedset.remove(f)
    for f in sorted(modified + added + removed):
        to = None
        tn = None
        binarydiff = False
        header = []

23995:d8330fb8c44d

    copyto = dict([(v, k) for k, v in copy.items()])

    if opts.git:
        revs = None

    addedset, removedset = set(added), set(removed)
    # Fix up  added, since merged-in additions appear as
    # modifications during merges
    for f in modified:
        if f not in ctx1:
            addedset.add(f)
    for f in sorted(modified + added + removed):
        to = None
        tn = None
        binarydiff = False
        header = []