mercurial/cmdutil.py

41684:a8d3a4be066e

    if opts.get('addremove'):
        dsguard = dirstateguard.dirstateguard(repo, 'commit')
    with dsguard or util.nullcontextmanager():
        if dsguard:
            relative = scmutil.anypats(pats, opts)
            uipathfn = scmutil.getuipathfn(repo, forcerelativevalue=relative)
            if scmutil.addremove(repo, matcher, "", uipathfn, opts) != 0:
                raise error.Abort(
                    _("failed to mark all new/missing files as added/removed"))

        return commitfunc(ui, repo, message, matcher, opts)

        # add/remove the files to the working copy if the "addremove" option
        # was specified.
        matcher = scmutil.match(wctx, pats, opts)
        relative = scmutil.anypats(pats, opts)
        uipathfn = scmutil.getuipathfn(repo, forcerelativevalue=relative)
        if (opts.get('addremove')
            and scmutil.addremove(repo, matcher, "", uipathfn, opts)):
            raise error.Abort(
                _("failed to mark all new/missing files as added/removed"))

41685:b81ecf3571d5

    if opts.get('addremove'):
        dsguard = dirstateguard.dirstateguard(repo, 'commit')
    with dsguard or util.nullcontextmanager():
        if dsguard:
            relative = scmutil.anypats(pats, opts)
            uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
            if scmutil.addremove(repo, matcher, "", uipathfn, opts) != 0:
                raise error.Abort(
                    _("failed to mark all new/missing files as added/removed"))

        return commitfunc(ui, repo, message, matcher, opts)

        # add/remove the files to the working copy if the "addremove" option
        # was specified.
        matcher = scmutil.match(wctx, pats, opts)
        relative = scmutil.anypats(pats, opts)
        uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
        if (opts.get('addremove')
            and scmutil.addremove(repo, matcher, "", uipathfn, opts)):
            raise error.Abort(
                _("failed to mark all new/missing files as added/removed"))