comparison mercurial/cmdutil.py @ 42921:4690902850df

uncommit: make -D/--date and -U/--user mutually exclusive

This is how amend and graft work (but not MQ).  I'm not sure why this didn't
work for me when I first tried it.

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

42920:a50661567f83

_linebelow = "^HG: ------------------------ >8 ------------------------$"

def resolvecommitoptions(ui, opts):
    """modify commit options dict to handle related options
    """
    # N.B. this is extremely similar to setupheaderopts() in mq.py
    if not opts.get(b'date') and opts.get(b'currentdate'):
        opts[b'date'] = b'%d %d' % dateutil.makedate()
    if not opts.get(b'user') and opts.get(b'currentuser'):
        opts[b'user'] = ui.username()

def ishunk(x):
    hunkclasses = (crecordmod.uihunk, patch.recordhunk)
    return isinstance(x, hunkclasses)

42921:4690902850df

_linebelow = "^HG: ------------------------ >8 ------------------------$"

def resolvecommitoptions(ui, opts):
    """modify commit options dict to handle related options
    """
    if opts.get('date') and opts.get('currentdate'):
        raise error.Abort(_('--date and --currentdate are mutually '
                            'exclusive'))
    if opts.get(b'user') and opts.get(b'currentuser'):
        raise error.Abort(_('--user and --currentuser are mutually '
                            'exclusive'))

    # N.B. this is extremely similar to setupheaderopts() in mq.py
    if opts.get(b'currentdate'):
        opts[b'date'] = b'%d %d' % dateutil.makedate()
    if opts.get(b'currentuser'):
        opts[b'user'] = ui.username()

def ishunk(x):
    hunkclasses = (crecordmod.uihunk, patch.recordhunk)
    return isinstance(x, hunkclasses)