This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5513

amend: concise logic for rewrite.updatetimestamp
AbandonedPublic

Authored by taapas1128 on Jan 7 2019, 8:22 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

This is a follow-up patch to D5491.

Logic for update time to current config option is made more concise as suggested by @pulkit .

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

taapas1128 created this revision.Jan 7 2019, 8:22 AM
taapas1128 edited the summary of this revision. (Show Details)Jan 7 2019, 8:25 AM
taapas1128 added a subscriber: pulkit.
pulkit added a comment.Jan 7 2019, 9:34 AM

Thanks for the quick follow-up. Yuya did it better and I pushed his patches which can be found at https://www.mercurial-scm.org/repo/hg-committed/rev/b153a4aa06f8 and https://www.mercurial-scm.org/repo/hg-committed/rev/cffa8e0ba77a. This one can be abandoned.

taapas1128 abandoned this revision.Jan 7 2019, 10:06 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (12 lines)

Diff 13048

mercurial/cmdutil.py

extra.update(old.extra()) extra.update(old.extra())
# Also update it from the from the wctx # Also update it from the from the wctx
extra.update(wctx.extra()) extra.update(wctx.extra())
user = opts.get('user') or old.user() user = opts.get('user') or old.user()
date = opts.get('date') or old.date() date = opts.get('date') or old.date()
if ui.configbool('rewrite','update-timestamp'): if (ui.configbool('rewrite','update-timestamp') and
if opts.get('date'): not opts.get('date')):
pass
else:
date = dateutil.makedate() date = dateutil.makedate()
# Parse the date to allow comparison between date and old.date() # Parse the date to allow comparison between date and old.date()
date = dateutil.parsedate(date) date = dateutil.parsedate(date)
if len(old.parents()) > 1: if len(old.parents()) > 1:
# ctx.files() isn't reliable for merges, so fall back to the # ctx.files() isn't reliable for merges, so fall back to the
# slower repo.status() method # slower repo.status() method
files = set([fn for st in base.status(old)[:3] files = set([fn for st in base.status(old)[:3]
if ((not changes) if ((not changes)
and newdesc == old.description() and newdesc == old.description()
and user == old.user() and user == old.user()
and pureextra == old.extra()): and pureextra == old.extra()):
# nothing changed. continuing here would create a new node # nothing changed. continuing here would create a new node
# anyway because of the amend_source noise. # anyway because of the amend_source noise.
# #
# This not what we expect from amend. # This not what we expect from amend.
if (date == old.date() or if (date == old.date() or not opts.get('date')):
(ui.configbool('rewrite','update-timestamp') and
not opts.get('date'))):
return old.node() return old.node()
commitphase = None commitphase = None
if opts.get('secret'): if opts.get('secret'):
commitphase = phases.secret commitphase = phases.secret
newid = repo.commitctx(new) newid = repo.commitctx(new)
# Reroute the working copy parent to the new changeset # Reroute the working copy parent to the new changeset