comparison mercurial/commands.py @ 33885:800bb35d891e

pushvars: do not mangle repo state

Setting `repo._shellvars` works but is not a clean way to pass the pushvars
information from the push command to the exchange operation. Therefore
change it to actually pass `pushvars` as a push operation argument instead.

This makes third party extension like remotenames easier to support pushvars
cleanly. The key value parsing and verification code has been moved to a
lower level so it's harder to be bypassed and easier to be used in
remotenames which could replace `push` command entirely.

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

33883:e5d104c35e51

            if result == 0:
                return not result
    finally:
        del repo._subtoppath

    pushvars = opts.get('pushvars')
    if pushvars:
        shellvars = {}
        for raw in pushvars:
            if '=' not in raw:
                msg = ("unable to parse variable '%s', should follow "
                        "'KEY=VALUE' or 'KEY=' format")
                raise error.Abort(msg % raw)
            k, v = raw.split('=', 1)
            shellvars[k] = v

        repo._shellvars = shellvars

    pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
                           newbranch=opts.get('new_branch'),
                           bookmarks=opts.get('bookmark', ()),
                           opargs=opts.get('opargs'))

    if pushvars:
        del repo._shellvars

    result = not pushop.cgresult

    if pushop.bkresult is not None:
        if pushop.bkresult == 2:

33885:800bb35d891e

            if result == 0:
                return not result
    finally:
        del repo._subtoppath

    opargs = dict(opts.get('opargs', {})) # copy opargs since we may mutate it
    opargs.setdefault('pushvars', []).extend(opts.get('pushvars', []))

    pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
                           newbranch=opts.get('new_branch'),
                           bookmarks=opts.get('bookmark', ()),
                           opargs=opargs)

    result = not pushop.cgresult

    if pushop.bkresult is not None:
        if pushop.bkresult == 2: