comparison mercurial/merge.py @ 45338:72b8c082676b

mergeresult: implement a len() function and use it

In next patch we will start yielding from `getactions()` instead of building and
returning a list. Hence we can no longer rely on that for getting us a length.

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

45337:5ce63ee1fe3d

                for f, (args, msg) in pycompat.iteritems(
                    self._actionmapping[a]
                ):
                    res.append((f, args, msg))
        return res

    @property
    def actions(self):
        return self._filemapping

        if wctx[f].lexists():
            repo.ui.debug(b"removing %s\n" % f)
            wctx[f].audit()
            wctx[f].remove()

    numupdates = len(mresult.actions) - len(
        mresult._actionmapping[mergestatemod.ACTION_KEEP]
    )
    progress = repo.ui.makeprogress(
        _(b'updating'), unit=_(b'files'), total=numupdates
    )

    if b'.hgsubstate' in mresult._actionmapping[mergestatemod.ACTION_REMOVE]:

        (repo, wctx),
        mresult.getactions([mergestatemod.ACTION_REMOVE], sort=True),
    )
    for i, item in prog:
        progress.increment(step=i, item=item)
    removed = len(mresult._actionmapping[mergestatemod.ACTION_REMOVE])

    # resolve path conflicts (must come before getting)
    for f, args, msg in mresult.getactions(
        [mergestatemod.ACTION_PATH_CONFLICT_RESOLVE], sort=True
    ):

        if final:
            getfiledata = res
        else:
            i, item = res
            progress.increment(step=i, item=item)
    updated = len(mresult._actionmapping[mergestatemod.ACTION_GET])

    if b'.hgsubstate' in mresult._actionmapping[mergestatemod.ACTION_GET]:
        subrepoutil.submerge(repo, wctx, mctx, wctx, overwrite, labels)

    # forget (manifest only, just log it) (must come first)

            if a[0] not in mfiles:
                mresult.removefile(a[0])

    progress.complete()
    assert len(getfiledata) == (
        len(mresult._actionmapping[mergestatemod.ACTION_GET])
        if wantfiledata
        else 0
    )
    return updateresult(updated, merged, removed, unresolved), getfiledata


def _advertisefsmonitor(repo, num_gets, p1node):

        if updatedirstate:
            repo.hook(b'preupdate', throw=True, parent1=xp1, parent2=xp2)
            # note that we're in the middle of an update
            repo.vfs.write(b'updatestate', p2.hex())

        # Convert to dictionary-of-lists format
        actions = mresult.actionsdict

        _advertisefsmonitor(
            repo, len(actions[mergestatemod.ACTION_GET]), p1.node()
        )

        wantfiledata = updatedirstate and not branchmerge
        stats, getfiledata = applyupdates(
            repo,

45338:72b8c082676b

                for f, (args, msg) in pycompat.iteritems(
                    self._actionmapping[a]
                ):
                    res.append((f, args, msg))
        return res

    def len(self, actions=None):
        """ returns number of files which needs actions

        if actions is passed, total of number of files in that action
        only is returned """

        if actions is None:
            return len(self._filemapping)

        return sum(len(self._actionmapping[a]) for a in actions)

    @property
    def actions(self):
        return self._filemapping

        if wctx[f].lexists():
            repo.ui.debug(b"removing %s\n" % f)
            wctx[f].audit()
            wctx[f].remove()

    numupdates = mresult.len() - mresult.len((mergestatemod.ACTION_KEEP,))
    progress = repo.ui.makeprogress(
        _(b'updating'), unit=_(b'files'), total=numupdates
    )

    if b'.hgsubstate' in mresult._actionmapping[mergestatemod.ACTION_REMOVE]:

        (repo, wctx),
        mresult.getactions([mergestatemod.ACTION_REMOVE], sort=True),
    )
    for i, item in prog:
        progress.increment(step=i, item=item)
    removed = mresult.len((mergestatemod.ACTION_REMOVE,))

    # resolve path conflicts (must come before getting)
    for f, args, msg in mresult.getactions(
        [mergestatemod.ACTION_PATH_CONFLICT_RESOLVE], sort=True
    ):

        if final:
            getfiledata = res
        else:
            i, item = res
            progress.increment(step=i, item=item)
    updated = mresult.len((mergestatemod.ACTION_GET,))

    if b'.hgsubstate' in mresult._actionmapping[mergestatemod.ACTION_GET]:
        subrepoutil.submerge(repo, wctx, mctx, wctx, overwrite, labels)

    # forget (manifest only, just log it) (must come first)

            if a[0] not in mfiles:
                mresult.removefile(a[0])

    progress.complete()
    assert len(getfiledata) == (
        mresult.len((mergestatemod.ACTION_GET,)) if wantfiledata else 0
    )
    return updateresult(updated, merged, removed, unresolved), getfiledata


def _advertisefsmonitor(repo, num_gets, p1node):

        if updatedirstate:
            repo.hook(b'preupdate', throw=True, parent1=xp1, parent2=xp2)
            # note that we're in the middle of an update
            repo.vfs.write(b'updatestate', p2.hex())

        _advertisefsmonitor(
            repo, mresult.len((mergestatemod.ACTION_GET,)), p1.node()
        )

        wantfiledata = updatedirstate and not branchmerge
        stats, getfiledata = applyupdates(
            repo,