comparison mercurial/merge.py @ 18541:5ed6a375e9ca

merge: delay debug messages for merge actions

Show messages at a point where the actions have been sorted, thus preparing for
backout of 760c0d67ce5e.

This makes manifestmerge more of a silent operation, just like 'copies' is.

Indent 'preserving' messages to make them subordinate to the action logging so
they fit in the new context. (The 'preserving' messages are quite redundant and
could also be removed completely.)

18540:139529b0a191

    actions = []
    state = branchmerge and 'r' or 'f'
    for f in wctx.deleted():
        if f not in mctx:
            actions.append((f, state, None))

    if not branchmerge:
        for f in wctx.removed():
            if f not in mctx:
                actions.append((f, "f", None))

    return actions

def manifestmerge(repo, p1, p2, pa, overwrite, partial):
    """

    overwrite = whether we clobber working files
    partial = function to filter file lists
    """

    def act(msg, m, f, *args):
        repo.ui.debug(" %s: %s -> %s\n" % (f, msg, m))
        actions.append((f, m, args))

    actions, copy, movewithdir = [], {}, {}

    if overwrite:
        pa = p1

    moves = []
    actions.sort(key=actionkey)

    # prescan for merges
    for a in actions:
        f, m, args = a
        if m == "m": # merge
            f2, fd, move = args
            if fd == '.hgsubstate': # merged internally
                continue
            repo.ui.debug("preserving %s for resolve of %s\n" % (f, fd))
            fcl = wctx[f]
            fco = mctx[f2]
            if mctx == actx: # backwards, use working dir parent as ancestor
                if fcl.parents():
                    fca = fcl.p1()

            audit(f)
            util.unlinkpath(repo.wjoin(f))

    numupdates = len(actions)
    for i, a in enumerate(actions):
        f, m, args = a
        repo.ui.progress(_('updating'), i + 1, item=f, total=numupdates,
                         unit=_('files'))
        if m == "r": # remove
            repo.ui.note(_("removing %s\n") % f)
            audit(f)

def recordupdates(repo, actions, branchmerge):
    "record merge actions to the dirstate"

    for a in actions:
        f, m, args = a
        if m == "r": # remove
            if branchmerge:
                repo.dirstate.remove(f)
            else:
                repo.dirstate.drop(f)

18541:5ed6a375e9ca

    actions = []
    state = branchmerge and 'r' or 'f'
    for f in wctx.deleted():
        if f not in mctx:
            actions.append((f, state, None, "forget deleted"))

    if not branchmerge:
        for f in wctx.removed():
            if f not in mctx:
                actions.append((f, "f", None, "forget removed"))

    return actions

def manifestmerge(repo, p1, p2, pa, overwrite, partial):
    """

    overwrite = whether we clobber working files
    partial = function to filter file lists
    """

    def act(msg, m, f, *args):
        actions.append((f, m, args, msg))

    actions, copy, movewithdir = [], {}, {}

    if overwrite:
        pa = p1

    moves = []
    actions.sort(key=actionkey)

    # prescan for merges
    for a in actions:
        f, m, args, msg = a
        repo.ui.debug(" %s: %s -> %s\n" % (f, msg, m))
        if m == "m": # merge
            f2, fd, move = args
            if fd == '.hgsubstate': # merged internally
                continue
            repo.ui.debug("  preserving %s for resolve of %s\n" % (f, fd))
            fcl = wctx[f]
            fco = mctx[f2]
            if mctx == actx: # backwards, use working dir parent as ancestor
                if fcl.parents():
                    fca = fcl.p1()

            audit(f)
            util.unlinkpath(repo.wjoin(f))

    numupdates = len(actions)
    for i, a in enumerate(actions):
        f, m, args, msg = a
        repo.ui.progress(_('updating'), i + 1, item=f, total=numupdates,
                         unit=_('files'))
        if m == "r": # remove
            repo.ui.note(_("removing %s\n") % f)
            audit(f)

def recordupdates(repo, actions, branchmerge):
    "record merge actions to the dirstate"

    for a in actions:
        f, m, args, msg = a
        if m == "r": # remove
            if branchmerge:
                repo.dirstate.remove(f)
            else:
                repo.dirstate.drop(f)