comparison mercurial/merge.py @ 43787:be8552f25cab

cleanup: fix docstring formatting

This is just removing the b'' prefix (except demandimportpy2), and making sure
it is triple quoted.  I skipped the mapping.py module in zope because that's 3rd
party code.

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

43786:421ea5772039

    assert len(getfiledata) == (len(actions[ACTION_GET]) if wantfiledata else 0)
    return updateresult(updated, merged, removed, unresolved), getfiledata


def recordupdates(repo, actions, branchmerge, getfiledata):
    b"record merge actions to the dirstate"
    # remove (must come first)
    for f, args, msg in actions.get(ACTION_REMOVE, []):
        if branchmerge:
            repo.dirstate.remove(f)
        else:

43787:be8552f25cab

    assert len(getfiledata) == (len(actions[ACTION_GET]) if wantfiledata else 0)
    return updateresult(updated, merged, removed, unresolved), getfiledata


def recordupdates(repo, actions, branchmerge, getfiledata):
    """record merge actions to the dirstate"""
    # remove (must come first)
    for f, args, msg in actions.get(ACTION_REMOVE, []):
        if branchmerge:
            repo.dirstate.remove(f)
        else: