comparison mercurial/cmdutil.py @ 42932:e4803231f538

amend: add option to update to the current user

This is also from the evolve extension's version of amend.  A side effect of
this refactoring is for uncommit to support `rewrite.update-timestamp`.

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

42931:181ee2118a96

# editor text
_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)

        extra.update(old.extra())

        # Also update it from the from the wctx
        extra.update(wctx.extra())

        user = opts.get('user') or old.user()

        datemaydiffer = False  # date-only change should be ignored?
        if opts.get('date') and opts.get('currentdate'):
            raise error.Abort(_('--date and --currentdate are mutually '
                                'exclusive'))
        if opts.get('date'):
            date = dateutil.parsedate(opts.get('date'))
        elif opts.get('currentdate'):
            date = dateutil.makedate()
        elif (ui.configbool('rewrite', 'update-timestamp')
              and opts.get('currentdate') is None):
            date = dateutil.makedate()
            datemaydiffer = True
        else:
            date = old.date()

        if len(old.parents()) > 1:
            # ctx.files() isn't reliable for merges, so fall back to the
            # slower repo.status() method
            files = {fn for st in base.status(old)[:3] for fn in st}

42932:e4803231f538

# editor text
_linebelow = "^HG: ------------------------ >8 ------------------------$"

def resolvecommitoptions(ui, opts):
    """modify commit options dict to handle related options

    The return value indicates that ``rewrite.update-timestamp`` is the reason
    the ``date`` option is set.
    """
    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'))

    datemaydiffer = False  # date-only change should be ignored?

    if opts.get(b'currentdate'):
        opts[b'date'] = b'%d %d' % dateutil.makedate()
    elif (not opts.get('date')
          and ui.configbool('rewrite', 'update-timestamp')
          and opts.get('currentdate') is None):
        opts[b'date'] = b'%d %d' % dateutil.makedate()
        datemaydiffer = True

    if opts.get(b'currentuser'):
        opts[b'user'] = ui.username()

    return datemaydiffer

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

        extra.update(old.extra())

        # Also update it from the from the wctx
        extra.update(wctx.extra())

        # date-only change should be ignored?
        datemaydiffer = resolvecommitoptions(ui, opts)

        date = old.date()
        if opts.get('date'):
            date = dateutil.parsedate(opts.get('date'))
        user = opts.get('user') or old.user()

        if len(old.parents()) > 1:
            # ctx.files() isn't reliable for merges, so fall back to the
            # slower repo.status() method
            files = {fn for st in base.status(old)[:3] for fn in st}