comparison mercurial/commands.py @ 49769:f65656572e25

commit: move check for incompatible args earlier

I think it makes sense to check the command line arguments as early as possible,
so we don't have to wait for a repo lock to tell the user that they passed
invalid arguments.

49768:bcae90c53def

      - amend the current commit and set the date to now::

          hg commit --amend --date now
    """
    with repo.wlock(), repo.lock():
        return _docommit(ui, repo, *pats, **opts)


def _docommit(ui, repo, *pats, **opts):

        # ret can be 0 (no changes to record) or the value returned by
        # commit(), 1 if nothing changed or None on success.
        return 1 if ret == 0 else ret

    if opts.get('subrepos'):
        cmdutil.check_incompatible_arguments(opts, 'subrepos', ['amend'])
        # Let --subrepos on the command line override config setting.
        ui.setconfig(b'ui', b'commitsubrepos', True, b'commit')

    cmdutil.checkunfinished(repo, commit=True)

49769:f65656572e25

      - amend the current commit and set the date to now::

          hg commit --amend --date now
    """
    cmdutil.check_incompatible_arguments(opts, 'subrepos', ['amend'])
    with repo.wlock(), repo.lock():
        return _docommit(ui, repo, *pats, **opts)


def _docommit(ui, repo, *pats, **opts):

        # ret can be 0 (no changes to record) or the value returned by
        # commit(), 1 if nothing changed or None on success.
        return 1 if ret == 0 else ret

    if opts.get('subrepos'):
        # Let --subrepos on the command line override config setting.
        ui.setconfig(b'ui', b'commitsubrepos', True, b'commit')

    cmdutil.checkunfinished(repo, commit=True)