( )⚙ D691 cmdutil: fix amend when passing a date

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D691

cmdutil: fix amend when passing a date
ClosedPublic

Authored by lothiraldan on Sep 12 2017, 1:24 PM.

Details

Reviewers
singhsrb
Group Reviewers
hg-reviewers
Commits
rHGae95853c250a: cmdutil: fix amend when passing a date
Summary

Following https://phab.mercurial-scm.org/D636, passing the same date that the
changeset to amend would results in no new commits but the output changed
from:

$ hg amend -d '0 0'
nothing changed
[1]

to:

$ hg amend -d '0 0'

Restore the old behavior by parsing the date passed as parameter so the
condition "date == old.date()" correctly works in cases both dates are
identical.

Add a test for covering this regression.

This bug was found thanks to Evolve test suite.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

lothiraldan created this revision.Sep 12 2017, 1:24 PM
singhsrb accepted this revision.Sep 12 2017, 1:56 PM
singhsrb added a subscriber: singhsrb.

@lothiraldan: Thanks for taking care of this and adding the corresponding tests.

Closed by commit rHGae95853c250a: cmdutil: fix amend when passing a date (authored by lothiraldan). · Explain WhySep 12 2017, 2:22 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (3 lines)
Mtests/test-amend.t (8 lines)

Diff 1763

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()
# Parse the date to allow comparison between date and old.date()
date = util.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 repo.status(base, old)[:3] files = set([fn for st in repo.status(base, old)[:3]
for fn in st]) for fn in st])
else: else:
files = set(old.files()) files = set(old.files())

tests/test-amend.t

#endif #endif
Nothing changed Nothing changed
$ hg amend $ hg amend
nothing changed nothing changed
[1] [1]
$ hg amend -d "0 0"
nothing changed
[1]
$ hg amend -d "Thu Jan 01 00:00:00 1970 UTC"
nothing changed
[1]
Matcher and metadata options Matcher and metadata options
$ echo 3 > C $ echo 3 > C
$ echo 4 > D $ echo 4 > D
$ hg add C D $ hg add C D
$ hg amend -m NEWMESSAGE -I C $ hg amend -m NEWMESSAGE -I C
saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/be169c7e8dbe-7684ddc5-amend.hg (glob) (obsstore-off !) saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/be169c7e8dbe-7684ddc5-amend.hg (glob) (obsstore-off !)
$ hg log -r . -T '{node|short} {desc} {files}\n' $ hg log -r . -T '{node|short} {desc} {files}\n'