This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8932

commit: clear mergestate also with --amend (issue6304)
ClosedPublic

Authored by martinvonz on Aug 18 2020, 6:37 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG6ba7190ff863: commit: clear mergestate also with --amend (issue6304)
Summary

The hg commit --amend uses the in-memory code, which naturally
doesn't touch the merge state (well, it shouldn't anyway; I think I've
fixed bugs in that area recently). We therefore need to clear the
mergestate after calling repo.commitctx() since we expect that from
hg commit --amend.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

martinvonz created this revision.Aug 18 2020, 6:37 PM
pulkit accepted this revision.Aug 24 2020, 3:34 AM
This revision is now accepted and ready to land.Aug 24 2020, 3:34 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (1 line)
Mtests/test-amend.t (1 line)

Diff 22411

mercurial/cmdutil.py

# #
# This not what we expect from amend. # This not what we expect from amend.
return old.node() return old.node()
commitphase = None commitphase = None
if opts.get(b'secret'): if opts.get(b'secret'):
commitphase = phases.secret commitphase = phases.secret
newid = repo.commitctx(new) newid = repo.commitctx(new)
ms.reset()
# Reroute the working copy parent to the new changeset # Reroute the working copy parent to the new changeset
repo.setparents(newid, nullid) repo.setparents(newid, nullid)
mapping = {old.node(): (newid,)} mapping = {old.node(): (newid,)}
obsmetadata = None obsmetadata = None
if opts.get(b'note'): if opts.get(b'note'):
obsmetadata = {b'note': encoding.fromlocal(opts[b'note'])} obsmetadata = {b'note': encoding.fromlocal(opts[b'note'])}
backup = ui.configbool(b'rewrite', b'backup-bundle') backup = ui.configbool(b'rewrite', b'backup-bundle')

tests/test-amend.t

use 'hg resolve' to retry unresolved file merges use 'hg resolve' to retry unresolved file merges
[1] [1]
$ echo d > f $ echo d > f
$ hg resolve -m f $ hg resolve -m f
(no more unresolved files) (no more unresolved files)
$ hg ci --amend --config experimental.evolution.allowunstable=True $ hg ci --amend --config experimental.evolution.allowunstable=True
1 new orphan changesets 1 new orphan changesets
$ hg resolve -l $ hg resolve -l
R f
$ cd .. $ cd ..
#endif #endif
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