comparison mercurial/cmdutil.py @ 41120:79f8f032c706

amend: add config option to update time to current in hg amend (issue5828)

The given config option i.e. `rewrite.update-timestamp` updates date to
current when //True//. However when only date is to be updated to current
with the working directory clean and no other attributes changing then it
does not amend as stated in issue 5828. Further when `--date` flag is specified
along with the new config option then `--date` is given priority over the
config option.

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

41119:685cf59a134f

        extra.update(wctx.extra())

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

        # Parse the date to allow comparison between date and old.date()
        date = dateutil.parsedate(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()
            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)

41120:79f8f032c706

        extra.update(wctx.extra())

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

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

        # Parse the date to allow comparison between date and old.date()
        date = dateutil.parsedate(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)