This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2014

amend: --no-secret overrides phases.new-commit and previous phase
AbandonedPublic

Authored by spectral on Feb 2 2018, 6:40 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

Previously, commit --amend would keep the phase of the commit that's being
amended, and commit --amend --secret would force it to secret. There was no
mechanism to forcibly change a secret commit to draft in one step.

This change is being made mostly for parity with what users likely expect based
on the new behavior of commit --no-secret overriding phases.new-commit=secret;
it was confusing when writing the tests that commit --amend --no-secret didn't
operate the same.

Like with commit --no-secret, if the parent is secret, this will silently
ignore the --no-secret option and the new commit will be secret.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

Diff 5168

mercurial/cmdutil.py

and date == old.date() and date == old.date()
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.
return old.node() return old.node()
if opts.get('secret'): if opts.get('secret') is not None:
commitphase = 'secret' commitphase = 'secret' if opts.get('secret') else 'draft'
else: else:
commitphase = old.phase() commitphase = old.phase()
overrides = {('phases', 'new-commit'): commitphase} overrides = {('phases', 'new-commit'): commitphase}
with ui.configoverride(overrides, 'amend'): with ui.configoverride(overrides, 'amend'):
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
repo.setparents(newid, nullid) repo.setparents(newid, nullid)

tests/test-commit-amend.t

$ hg phase '.^::.' $ hg phase '.^::.'
29: draft 29: draft
30: draft 30: draft
$ hg commit --amend --secret -m 'amend as secret' -q $ hg commit --amend --secret -m 'amend as secret' -q
$ hg phase '.^::.' $ hg phase '.^::.'
29: draft 29: draft
31: secret 31: secret
Test that amend with --no-secret creates new draft changeset forcibly
(ignoring both the existing phase and phases.new-commit=secret)
---------------------------------------------------------------------
$ hg phase '.^::.'
29: draft
31: secret
$ hg --config phases.new-commit=secret \
> commit --amend --no-secret -m 'amend as no-secret' -q
$ hg phase '.^::.'
29: draft
32: draft
Test that amend with --edit invokes editor forcibly Test that amend with --edit invokes editor forcibly
--------------------------------------------------- ---------------------------------------------------
$ hg parents --template "{desc}\n" $ hg parents --template "{desc}\n"
amend as secret amend as no-secret
$ HGEDITOR=cat hg commit --amend -m "editor should be suppressed" $ HGEDITOR=cat hg commit --amend -m "editor should be suppressed"
$ hg parents --template "{desc}\n" $ hg parents --template "{desc}\n"
editor should be suppressed editor should be suppressed
$ hg status --rev '.^1::.' $ hg status --rev '.^1::.'
A foo A foo
$ HGEDITOR=cat hg commit --amend -m "editor should be invoked" --edit $ HGEDITOR=cat hg commit --amend -m "editor should be invoked" --edit
editor should be invoked editor should be invoked