comparison mercurial/commands.py @ 26783:50213e4d25bf

resolve: only create wctx once

This allows for status and other results on the wctx to be cached between iterations.

26782:cbd04ce641b9

        if not (ms.active() or repo.dirstate.p2() != nullid):
            raise error.Abort(
                _('resolve command not applicable when not merging'))

        m = scmutil.match(repo[None], pats, opts)
        ret = 0
        didwork = False

        tocomplete = []
        for f in ms:

            if mark:
                ms.mark(f, "r")
            elif unmark:
                ms.mark(f, "u")
            else:
                wctx = repo[None]

                # backup pre-resolve (merge uses .orig for its own purposes)
                a = repo.wjoin(f)
                util.copyfile(a, a + ".resolve")

                try:

26783:50213e4d25bf

        if not (ms.active() or repo.dirstate.p2() != nullid):
            raise error.Abort(
                _('resolve command not applicable when not merging'))

        wctx = repo[None]

        m = scmutil.match(wctx, pats, opts)
        ret = 0
        didwork = False

        tocomplete = []
        for f in ms:

            if mark:
                ms.mark(f, "r")
            elif unmark:
                ms.mark(f, "u")
            else:
                # backup pre-resolve (merge uses .orig for its own purposes)
                a = repo.wjoin(f)
                util.copyfile(a, a + ".resolve")

                try: