Mercurial > evolve
view tests/test-namespaces-precheck.t @ 6655:81fe0a498447 stable
topic: internal config option to fix hg pick behavior (issue6406)
After some consideration, hg pick was made to always use current topic (and
topic namespace), even if it's not set, in which case the resulting changeset
will not have any topic.
Previously the intended behavior was to only update topic if there was an
active topic, and not touch commit extras at all otherwise. That wasn't ideal,
since pick doesn't change active topic, and amending the just-picked commit
would unset its topic without clear user's intent to do so and to their
surprise.
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Sat, 27 Jan 2024 17:36:39 -0300 |
parents | 80d5d4e587f7 |
children | e846964c93c2 |
line wrap: on
line source
Checking affected topic namespaces before history rewrites ========================================================== $ . "$TESTDIR/testlib/common.sh" $ cat >> $HGRCPATH << EOF > [extensions] > evolve = > topic = > rebase = > histedit = > [phases] > publish = no > [experimental] > tns-allow-rewrite = > EOF $ hg init repo $ cd repo Make sure general checks in precheck() happen before topic namespaces checks $ hg prune null abort: cannot prune the null revision (no changeset checked out) [10] $ echo apple > a $ hg ci -qAm apple $ hg debug-topic-namespace foo marked working directory as topic namespace: foo $ hg topic bar marked working directory as topic: bar $ echo banana > b $ hg ci -qAm 'banana' Allowing topic namespaces with --config works correctly $ echo broccoli > b $ hg amend -m 'broccoli' abort: refusing to amend changesets with these topic namespaces: foo (modify experimental.tns-allow-rewrite to allow rewriting changesets from these topic namespaces) [10] $ hg amend -m 'broccoli' --config experimental.tns-allow-rewrite=foo,something-unrelated $ echo coconut > b $ hg ci -qAm 'coconut' Testing history-rewriting commands from evolve extension $ hg amend -m 'coconut' abort: refusing to amend changesets with these topic namespaces: foo (modify experimental.tns-allow-rewrite to allow rewriting changesets from these topic namespaces) [10] $ hg amend --patch -m 'coconut' abort: refusing to amend changesets with these topic namespaces: foo (modify experimental.tns-allow-rewrite to allow rewriting changesets from these topic namespaces) [10] $ hg uncommit abort: refusing to uncommit changesets with these topic namespaces: foo (modify experimental.tns-allow-rewrite to allow rewriting changesets from these topic namespaces) [10] $ hg prune -r . abort: refusing to prune changesets with these topic namespaces: foo (modify experimental.tns-allow-rewrite to allow rewriting changesets from these topic namespaces) [10] $ hg split -r . abort: refusing to split changesets with these topic namespaces: foo (modify experimental.tns-allow-rewrite to allow rewriting changesets from these topic namespaces) [10] $ hg touch -r . abort: refusing to touch changesets with these topic namespaces: foo (modify experimental.tns-allow-rewrite to allow rewriting changesets from these topic namespaces) [10] Testing core history-rewriting commands $ hg ci --amend abort: refusing to amend changesets with these topic namespaces: foo (modify experimental.tns-allow-rewrite to allow rewriting changesets from these topic namespaces) [10] $ hg branch different-branch --rev . abort: refusing to change branch of changesets with these topic namespaces: foo (modify experimental.tns-allow-rewrite to allow rewriting changesets from these topic namespaces) [10] $ hg rebase -r . -d null abort: refusing to rebase changesets with these topic namespaces: foo (modify experimental.tns-allow-rewrite to allow rewriting changesets from these topic namespaces) [10] $ hg histedit abort: refusing to edit changesets with these topic namespaces: foo (modify experimental.tns-allow-rewrite to allow rewriting changesets from these topic namespaces) [10] $ cd ..