comparison mercurial/cmdutil.py @ 47732:dc610e325302

revert: use `set_possibly_dirty` instead of `normallookup`

This is the newer, more semantic API.

Differential Revision: https://phab.mercurial-scm.org/D11174

47731:485ae37a7ec5

    if node == parent:
        # We're reverting to our parent. If possible, we'd like status
        # to report the file as clean. We have to use normallookup for
        # merges to avoid losing information about merged/dirty files.
        if p2 != repo.nullid:
            normal = repo.dirstate.normallookup
        else:
            normal = repo.dirstate.set_clean

    newlyaddedandmodifiedfiles = set()
    if interactive:

        if f not in newlyaddedandmodifiedfiles:
            prntstatusmsg(b'add', f)
            checkout(f)
            repo.dirstate.set_tracked(f)

    normal = repo.dirstate.normallookup
    if node == parent and p2 == repo.nullid:
        normal = repo.dirstate.set_clean
    for f in actions[b'undelete'][0]:
        if interactive:
            choice = repo.ui.promptchoice(

47732:dc610e325302

    if node == parent:
        # We're reverting to our parent. If possible, we'd like status
        # to report the file as clean. We have to use normallookup for
        # merges to avoid losing information about merged/dirty files.
        if p2 != repo.nullid:
            normal = repo.dirstate.set_tracked
        else:
            normal = repo.dirstate.set_clean

    newlyaddedandmodifiedfiles = set()
    if interactive:

        if f not in newlyaddedandmodifiedfiles:
            prntstatusmsg(b'add', f)
            checkout(f)
            repo.dirstate.set_tracked(f)

    normal = repo.dirstate.set_tracked
    if node == parent and p2 == repo.nullid:
        normal = repo.dirstate.set_clean
    for f in actions[b'undelete'][0]:
        if interactive:
            choice = repo.ui.promptchoice(