comparison mercurial/merge.py @ 18632:3e20079117c5

merge: handle subrepo merges and .hgsubstate specially

In an upcoming patch, we will update .hgsubstate in a non-interactive
worker process. Merges of subrepo contents will still need to occur in the
master process (since they may be interactive), so we move that code into
a place where it will always run in what will become the master process.

18631:e2dc5397bc82

    return actions

def actionkey(a):
    return a[1] == "r" and -1 or 0, a

def getremove(repo, wctx, mctx, overwrite, args):
    """apply usually-non-interactive updates to the working directory

    wctx is the working copy context
    mctx is the context to be merged into the working copy

    yields tuples for progress updates
    """
    audit = repo.wopener.audit
    for i, arg in enumerate(args):
        f = arg[0]
        if arg[1] == 'r':
            repo.ui.note(_("removing %s\n") % f)
            if f == '.hgsubstate': # subrepo states need updating
                subrepo.submerge(repo, wctx, mctx, wctx, overwrite)
            audit(f)
            try:
                util.unlinkpath(repo.wjoin(f), ignoremissing=True)
            except OSError, inst:
                repo.ui.warn(_("update failed to remove %s: %s!\n") %
                             (f, inst.strerror))
        else:
            repo.ui.note(_("getting %s\n") % f)
            repo.wwrite(f, mctx.filectx(f).data(), arg[2][0])
            if f == '.hgsubstate': # subrepo states need updating
                subrepo.submerge(repo, wctx, mctx, wctx, overwrite)
        yield i, f

def applyupdates(repo, actions, wctx, mctx, actx, overwrite):
    """apply the merge action list to the working directory

    workeractions = [a for a in actions if a[1] in 'gr']
    updated = len([a for a in workeractions if a[1] == 'g'])
    removed = len([a for a in workeractions if a[1] == 'r'])
    actions = [a for a in actions if a[1] not in 'gr']

    for i, item in getremove(repo, wctx, mctx, overwrite, workeractions):
        repo.ui.progress(_('updating'), i + 1, item=item, total=numupdates,
                         unit=_('files'))

    z = len(workeractions)

    for i, a in enumerate(actions):
        f, m, args, msg = a

18632:3e20079117c5

    return actions

def actionkey(a):
    return a[1] == "r" and -1 or 0, a

def getremove(repo, mctx, overwrite, args):
    """apply usually-non-interactive updates to the working directory

    mctx is the context to be merged into the working copy

    yields tuples for progress updates
    """
    audit = repo.wopener.audit
    for i, arg in enumerate(args):
        f = arg[0]
        if arg[1] == 'r':
            repo.ui.note(_("removing %s\n") % f)
            audit(f)
            try:
                util.unlinkpath(repo.wjoin(f), ignoremissing=True)
            except OSError, inst:
                repo.ui.warn(_("update failed to remove %s: %s!\n") %
                             (f, inst.strerror))
        else:
            repo.ui.note(_("getting %s\n") % f)
            repo.wwrite(f, mctx.filectx(f).data(), arg[2][0])
        yield i, f

def applyupdates(repo, actions, wctx, mctx, actx, overwrite):
    """apply the merge action list to the working directory

    workeractions = [a for a in actions if a[1] in 'gr']
    updated = len([a for a in workeractions if a[1] == 'g'])
    removed = len([a for a in workeractions if a[1] == 'r'])
    actions = [a for a in actions if a[1] not in 'gr']

    hgsub = [a[1] for a in workeractions if a[0] == '.hgsubstate']
    if hgsub and hgsub[0] == 'r':
        subrepo.submerge(repo, wctx, mctx, wctx, overwrite)

    for i, item in getremove(repo, mctx, overwrite, workeractions):
        repo.ui.progress(_('updating'), i + 1, item=item, total=numupdates,
                         unit=_('files'))

    if hgsub and hgsub[0] == 'g':
        subrepo.submerge(repo, wctx, mctx, wctx, overwrite)

    z = len(workeractions)

    for i, a in enumerate(actions):
        f, m, args, msg = a