comparison mercurial/cmdutil.py @ 41124:cffa8e0ba77a

amend: add boolean to ignore date-only change

I want to add -D/--currentdate option, which should behave slightly different
from the update-timestamp option.

41123:b153a4aa06f8

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

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

        if opts.get('date'):
            date = dateutil.parsedate(opts.get('date'))
        elif ui.configbool('rewrite', 'update-timestamp'):
            date = dateutil.makedate()
        else:
            date = old.date()

        if len(old.parents()) > 1:
            # ctx.files() isn't reliable for merges, so fall back to the

        newdesc = changelog.stripdesc(new.description())
        if ((not changes)
            and newdesc == old.description()
            and user == old.user()
            and pureextra == old.extra()):
            # nothing changed. continuing here would create a new node
            # anyway because of the amend_source noise.
            #
            # This not what we expect from amend.
            if (date == old.date() or
                (ui.configbool('rewrite', 'update-timestamp') and
                 not opts.get('date'))):
                return old.node()

        commitphase = None
        if opts.get('secret'):
            commitphase = phases.secret
        newid = repo.commitctx(new)

41124:cffa8e0ba77a

        # 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'):
            date = dateutil.parsedate(opts.get('date'))
        elif ui.configbool('rewrite', 'update-timestamp'):
            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

        newdesc = changelog.stripdesc(new.description())
        if ((not changes)
            and newdesc == old.description()
            and user == old.user()
            and (date == old.date() or datemaydiffer)
            and pureextra == old.extra()):
            # nothing changed. continuing here would create a new node
            # anyway because of the amend_source noise.
            #
            # This not what we expect from amend.
            return old.node()

        commitphase = None
        if opts.get('secret'):
            commitphase = phases.secret
        newid = repo.commitctx(new)